Skip to content

Fixed metrics privileges and improved possibilitycustomization #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed metrics privileges and improved possibilitycustomization #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions kubernetes-monitoring/mgmtagent_helm/resources/mgmtagent_kubernetes_dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
}
},
{
"displayName": "Pod CPU Usage",
"displayName": "Container CPU Usage",
"savedSearchId": "OOBSS-management-dashboard-123",
"row": 6,
"column": 0,
Expand All @@ -296,21 +296,21 @@
"nls": {},
"uiConfig": {
"chartInfo": {
"colorBy": "dimensions.containerName",
"colorBy": "dimensions.container",
"enableCorrelation": true,
"group": "aggregatedDatapoints.timestamp",
"series": "dimensions.containerName",
"series": "dimensions.container",
"value": "aggregatedDatapoints.value"
},
"defaultDataSource": "mgmtagent_kubernetes_metrics/podCpuUsage",
"defaultDataSource": "mgmtagent_kubernetes_metrics/container_cpu_usage_seconds_total",
"internalKey": "OOBSS-management-dashboard-123",
"jetConfig": {
"dataCursor": "on",
"legend": {
"position": "top",
"position": "end",
"rendered": true
},
"stack": "off",
"stack": "on",
"styleDefaults": {
"lineWidth": 2
},
Expand All @@ -327,11 +327,11 @@
},
"dataConfig": [
{
"name": "mgmtagent_kubernetes_metrics/podCpuUsage",
"name": "mgmtagent_kubernetes_metrics/container_cpu_usage_seconds_total",
"parameters": {
"compartmentId": "$(params.compartmentIdParam)",
"endTime": "$(context.time.end)",
"mql": "podCpuUsage[auto].groupBy(containerName).mean()",
"mql": "container_cpu_usage_seconds_total[1m]{cpu = total}.groupBy(container).sum()",
"namespace": "mgmtagent_kubernetes_metrics",
"startTime": "$(context.time.start)"
},
Expand All @@ -346,7 +346,7 @@
}
},
{
"displayName": "Pod Memory Usage",
"displayName": "Container Memory Usage",
"savedSearchId": "OOBSS-management-dashboard-123",
"row": 6,
"column": 6,
Expand All @@ -355,21 +355,21 @@
"nls": {},
"uiConfig": {
"chartInfo": {
"colorBy": "dimensions.containerName",
"colorBy": "dimensions.container",
"enableCorrelation": true,
"group": "aggregatedDatapoints.timestamp",
"series": "dimensions.containerName",
"series": "dimensions.container",
"value": "aggregatedDatapoints.value"
},
"defaultDataSource": "mgmtagent_kubernetes_metrics/podMemoryUsage",
"defaultDataSource": "mgmtagent_kubernetes_metrics/container_memory_working_set_bytes",
"internalKey": "OOBSS-management-dashboard-123",
"jetConfig": {
"dataCursor": "on",
"legend": {
"position": "top",
"position": "end",
"rendered": true
},
"stack": "off",
"stack": "on",
"styleDefaults": {
"lineWidth": 2
},
Expand All @@ -386,11 +386,11 @@
},
"dataConfig": [
{
"name": "mgmtagent_kubernetes_metrics/podMemoryUsage",
"name": "mgmtagent_kubernetes_metrics/container_memory_working_set_bytes",
"parameters": {
"compartmentId": "$(params.compartmentIdParam)",
"endTime": "$(params.time.end)",
"mql": "podMemoryUsage[auto].groupBy(containerName).mean()",
"mql": "container_memory_working_set_bytes[1m].groupBy(container).sum()",
"namespace": "mgmtagent_kubernetes_metrics",
"startTime": "$(params.time.start)"
},
Expand Down
2 changes: 2 additions & 0 deletions kubernetes-monitoring/mgmtagent_helm/templates/mgmtagent_cluster_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ rules:
- get
- list
- watch
- nonResourceURLs: ["/metrics"]
verbs: ["get"]
- apiGroups:
- metrics.k8s.io
resources:
Expand Down
9 changes: 9 additions & 0 deletions kubernetes-monitoring/mgmtagent_helm/templates/mgmtagent_statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,22 @@ spec:
mountPath: /opt/oracle
- name: mgmtagent-config
mountPath: /opt/oracle/mgmtagent_config
{{- range $v := .Values.mgmtagent.additionalConfigMaps }}
- name: ext-{{ $v.name }}
mountPath: {{ $v.mountPath }}
{{- end }}
volumes:
- name: mgmtagent-secret
secret:
secretName: mgmtagent-input-rsp
- name: mgmtagent-config
configMap:
name: mgmtagent-monitoring-config
{{- range $v := .Values.mgmtagent.additionalConfigMaps }}
- name: ext-{{ $v.name }}
configMap:
name: {{ $v.name }}
{{- end }}
volumeClaimTemplates:
- metadata:
name: mgmtagent-pvc
Expand Down
6 changes: 6 additions & 0 deletions kubernetes-monitoring/mgmtagent_helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ mgmtagent:
# Copy the downloaded Management Agent Install Key file under root helm directory as resources/input.rsp
installKey: resources/input.rsp
# Follow steps documented at https://github.com/oracle/docker-images/tree/main/OracleManagementAgent to build docker image.

# Allow user to mount additional configmap to customize management agent config json (i.e. customize prometheus collect time)
# additionalConfigMaps:
# - name: mgmt-agent-config
# mountPath: "/opt/oracle/mgmt_agent/agent_inst/config/destinations/OCI/services/Agent/1/types/"

image:
# Replace this value with actual docker image URL for Management Agent
url:
Expand Down