Skip to content

Commit

Permalink
Merge branch 'master' into etcd-cluster-info
Browse files Browse the repository at this point in the history
  • Loading branch information
smanda99 authored Dec 26, 2023
2 parents c6b5712 + 3fb5de1 commit f0b5587
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARCH := $(shell arch)
OS_TYPE := $(shell uname)
JB_OS_TYPE := $(shell uname | tr '[:upper:]' '[:lower:]')
JSONNET := https://github.com/google/go-jsonnet/releases/download/v0.20.0/go-jsonnet_0.20.0_$(OS_TYPE)_$(ARCH).tar.gz
JB = https://github.com/jsonnet-bundler/jsonnet-bundler/releases/latest/download/jb-$(JB_OS_TYPE)-$(ARCH)
JB := https://github.com/jsonnet-bundler/jsonnet-bundler/releases/latest/download/jb-$(JB_OS_TYPE)-$(subst x86_64,amd64,$(ARCH))
BINDIR = bin
TEMPLATESDIR = templates
OUTPUTDIR = rendered
Expand Down
2 changes: 1 addition & 1 deletion dittybopper/syncer/entrypoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def create_dashboards(self):
if "tags" in dashboard_json.keys():
dashboard_json["tags"].append(self.git_commit_hash)
else:
dashboard_json["tags"] = self.git_commit_hash
dashboard_json["tags"] = [self.git_commit_hash]
try:
response = requests.post(
f"{self.grafana_url}/api/dashboards/db",
Expand Down
47 changes: 47 additions & 0 deletions templates/General/hypershift-performance.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,19 @@ local suricataMemory = genericGraphLegendPanel('Suricata Memory(Running on Servi
)
);

local dynaoneagentMem = genericGraphLegendPanel('OneAgent Memory Usage', 'Cluster Prometheus', 'bytes').addTarget(
prometheus.target(
'sum(container_memory_rss{namespace=~"dynatrace",pod=~".*-oneagent-.*",container!=""}) by (node, namespace, pod)',
legendFormat='{{ node }}: {{ namespace }} : {{ pod }}',
)
);

local dynaoneagentCPU = genericGraphLegendPanel('OneAgent CPU Usage', 'Cluster Prometheus', 'percent').addTarget(
prometheus.target(
'sum(irate(container_cpu_usage_seconds_total{namespace=~"dynatrace", pod=~".*-oneagent-.*", container!~"POD|"}[2m])*100) by (node, namespace, pod)',
legendFormat='{{ node }}: {{ namespace }} : {{ pod }}',
)
);

// Overall stats on the management cluster

Expand Down Expand Up @@ -398,6 +411,34 @@ local request_duration_99th_quantile_by_resource = grafana.graphPanel.new(
)
);

// Dynatrace on the management cluster
local dynaactivegateMem = genericGraphLegendPanel('Active Gate Memory Usage', 'Cluster Prometheus', 'bytes').addTarget(
prometheus.target(
'sum(container_memory_rss{namespace=~"dynatrace",pod=~".*-activegate-.*",container!=""}) by (node, namespace, pod)',
legendFormat='{{ node }}: {{ namespace }} : {{ pod }}',
)
);

local dynaactivegateCPU = genericGraphLegendPanel('Active Gate CPU Usage', 'Cluster Prometheus', 'percent').addTarget(
prometheus.target(
'sum(irate(container_cpu_usage_seconds_total{namespace=~"dynatrace", pod=~".*-activegate-.*", container!~"POD|"}[2m])*100) by (node, namespace, pod)',
legendFormat='{{ node }}: {{ namespace }} : {{ pod }}',
)
);

local opentelemetryMem = genericGraphLegendPanel('Opentelemetry Memory Usage', 'Cluster Prometheus', 'bytes').addTarget(
prometheus.target(
'sum(container_memory_rss{namespace=~"dynatrace",pod=~"opentelemetry-.*",container!=""}) by (node, namespace, pod)',
legendFormat='{{ node }}: {{ namespace }} : {{ pod }}',
)
);

local opentelemetryCPU = genericGraphLegendPanel('Opentelemetry CPU Usage', 'Cluster Prometheus', 'percent').addTarget(
prometheus.target(
'sum(irate(container_cpu_usage_seconds_total{namespace=~"dynatrace", pod=~"opentelemetry-.*", container!~"POD|"}[2m])*100) by (node, namespace, pod)',
legendFormat='{{ node }}: {{ namespace }} : {{ pod }}',
)
);

// Management cluster metrics

Expand Down Expand Up @@ -1719,6 +1760,10 @@ grafana.dashboard.new(
clusterOperatorsDegraded { gridPos: { x: 8, y: 52, w: 8, h: 8 } },
FailedPods { gridPos: { x: 16, y: 52, w: 8, h: 8 } },
alerts { gridPos: { x: 0, y: 60, w: 24, h: 8 } },
dynaactivegateMem { gridPos: { x: 0, y: 18, w: 12, h: 8 } },
dynaactivegateCPU { gridPos: { x: 12, y: 18, w: 12, h: 8 } },
opentelemetryCPU { gridPos: { x: 0, y: 18, w: 12, h: 8 } },
opentelemetryMem { gridPos: { x: 12, y: 18, w: 12, h: 8 } },
],
), { gridPos: { x: 0, y: 4, w: 24, h: 1 } })

Expand Down Expand Up @@ -1753,6 +1798,8 @@ grafana.dashboard.new(
nodeMemory { gridPos: { x: 12, y: 2, w: 12, h: 8 } },
suricataCPU { gridPos: { x: 0, y: 18, w: 12, h: 8 } },
suricataMemory { gridPos: { x: 12, y: 18, w: 12, h: 8 } },
dynaoneagentCPU { gridPos: { x: 0, y: 18, w: 12, h: 8 } },
dynaoneagentMem { gridPos: { x: 12, y: 18, w: 12, h: 8 } },
]
), { gridPos: { x: 0, y: 4, w: 24, h: 1 } }
)
Expand Down

0 comments on commit f0b5587

Please sign in to comment.