From f3e90506fbbe4b5435d0591810ff185076c7dbd5 Mon Sep 17 00:00:00 2001 From: Manda-supraja26 Date: Fri, 26 Apr 2024 12:33:45 +0530 Subject: [PATCH 1/4] Migrating dashboards to v2 Version --- .github/workflows/release.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47178ee..3ff6b72 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,4 +25,4 @@ jobs: QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} - name: Build & push syncer image - run: make build-syncer-image push-syncer-image + run: make build-syncer-image v2 push-syncer-image diff --git a/Makefile b/Makefile index 67b9c17..3303400 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ $(OUTPUTDIR)/%.json: $(TEMPLATESDIR)/%.jsonnet v2: all @echo "Rendered the v2 dashboards with latest grafonnet library" -build-syncer-image: build +build-syncer-image: v2 podman build --platform=${PLATFORM} -f Dockerfile --manifest=${SYNCER_IMG_TAG} . push-syncer-image: From 2e00625002871e50f723226c1be9f90ea1e62a49 Mon Sep 17 00:00:00 2001 From: Manda-supraja26 Date: Mon, 29 Apr 2024 21:28:21 +0530 Subject: [PATCH 2/4] code fix in release.yml file --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ff6b72..365c337 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,4 +25,4 @@ jobs: QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} - name: Build & push syncer image - run: make build-syncer-image v2 push-syncer-image + run: make v2 build-syncer-image push-syncer-image From 75ed3da3e9adf1a7df9254f0065cc2baff3067f3 Mon Sep 17 00:00:00 2001 From: Andrew Collins Date: Wed, 22 May 2024 11:19:28 -0500 Subject: [PATCH 3/4] Show all three kube-controller-manager because sometimes they fail over during a run (#118) --- assets/kube-burner-report-ocp-wrapper/queries.libsonnet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/kube-burner-report-ocp-wrapper/queries.libsonnet b/assets/kube-burner-report-ocp-wrapper/queries.libsonnet index 4986e39..a849153 100644 --- a/assets/kube-burner-report-ocp-wrapper/queries.libsonnet +++ b/assets/kube-burner-report-ocp-wrapper/queries.libsonnet @@ -373,7 +373,7 @@ local elasticsearch = g.query.elasticsearch; + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') + elasticsearch.bucketAggs.Terms.settings.withOrderBy('1') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withSize("1"), + + elasticsearch.bucketAggs.Terms.settings.withSize("3"), elasticsearch.bucketAggs.Terms.withField("labels.container.keyword") + elasticsearch.bucketAggs.Terms.withId("4") + elasticsearch.bucketAggs.Terms.withType('terms') @@ -1581,4 +1581,4 @@ local elasticsearch = g.query.elasticsearch; + elasticsearch.withQuery("uuid.keyword: $uuid AND metricName.keyword: containerMemory-AggregatedWorkers") + elasticsearch.withTimeField('timestamp') }, -} \ No newline at end of file +} From b85b7ae0757f056ee20faa258b12b073454dbd51 Mon Sep 17 00:00:00 2001 From: Krishna Harsha Voora <14876995+krishvoor@users.noreply.github.com> Date: Tue, 11 Jun 2024 22:23:02 +0530 Subject: [PATCH 4/4] Update to ovnkube_controller_pod_creation_latency_seconds_bucket (#119) This PR updates to ovnkube_controller_pod_creation_latency_seconds_bucket from ovnkube_master_pod_creation_latency_seconds_bucket Signed-off-by: Krishna Harsha Voora --- assets/ocp-performance/queries.libsonnet | 2 +- assets/ovn-monitoring/queries.libsonnet | 2 +- templates/General/ocp-performance.jsonnet | 2 +- templates/General/ovn-dashboard.jsonnet | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/ocp-performance/queries.libsonnet b/assets/ocp-performance/queries.libsonnet index fee6ca6..274c3a1 100644 --- a/assets/ocp-performance/queries.libsonnet +++ b/assets/ocp-performance/queries.libsonnet @@ -77,7 +77,7 @@ local generateTimeSeriesQuery(query, legend) = [ }, ovnAnnotationLatency: { query(): - generateTimeSeriesQuery('histogram_quantile(0.99, sum(rate(ovnkube_master_pod_creation_latency_seconds_bucket[$interval])) by (pod,le)) > 0', '{{ pod }}') + generateTimeSeriesQuery('histogram_quantile(0.99, sum by (pod, le) (rate(ovnkube_controller_pod_creation_latency_seconds_bucket[$interval]))) > 0', '{{ pod }}') }, ovnCNIAdd: { query(): diff --git a/assets/ovn-monitoring/queries.libsonnet b/assets/ovn-monitoring/queries.libsonnet index c37cae9..0f7aece 100644 --- a/assets/ovn-monitoring/queries.libsonnet +++ b/assets/ovn-monitoring/queries.libsonnet @@ -57,7 +57,7 @@ local generateTimeSeriesQuery(query, legend) = [ ovnAnnotationLatency: { query(): - generateTimeSeriesQuery('histogram_quantile(0.99, sum(rate(ovnkube_master_pod_creation_latency_seconds_bucket[2m])) by (pod,le)) > 0','{{pod}} - Pod Annotation latency') + generateTimeSeriesQuery('histogram_quantile(0.99, sum by (pod, le) (rate(ovnkube_controller_pod_creation_latency_seconds_bucket[2m]))) > 0','{{pod}} - Pod Annotation latency') }, ovnCNIAdd: { diff --git a/templates/General/ocp-performance.jsonnet b/templates/General/ocp-performance.jsonnet index 42a9814..96d1702 100644 --- a/templates/General/ocp-performance.jsonnet +++ b/templates/General/ocp-performance.jsonnet @@ -187,7 +187,7 @@ local stackroxMem = genericGraphLegendPanel('Top 25 stackrox container RSS bytes // OVN local ovnAnnotationLatency = genericGraphPanel('99% Pod Annotation Latency', 's').addTarget( prometheus.target( - 'histogram_quantile(0.99, sum(rate(ovnkube_master_pod_creation_latency_seconds_bucket[$interval])) by (pod,le)) > 0', + 'histogram_quantile(0.99, sum by (pod, le) (rate(ovnkube_controller_pod_creation_latency_seconds_bucket[$interval]))) > 0', legendFormat='{{pod}}', ) ); diff --git a/templates/General/ovn-dashboard.jsonnet b/templates/General/ovn-dashboard.jsonnet index 2d1a3db..93cd51e 100644 --- a/templates/General/ovn-dashboard.jsonnet +++ b/templates/General/ovn-dashboard.jsonnet @@ -168,7 +168,7 @@ local work_queue_unfinished_latency = genericGraphLegendPanel('OVNKube Master wo local ovnAnnotationLatency = genericGraphLegendPanel('Pod Annotation Latency', 's').addTarget( prometheus.target( - 'histogram_quantile(0.99, sum(rate(ovnkube_master_pod_creation_latency_seconds_bucket[2m])) by (pod,le)) > 0', + 'histogram_quantile(0.99, sum by (pod, le) (rate(ovnkube_controller_pod_creation_latency_seconds_bucket[2m]))) > 0', legendFormat='{{pod}} - Pod Annotation latency', ) );