From a7b62030dbedf4a2120ae0d7d462e9147f54c98c Mon Sep 17 00:00:00 2001 From: vishnuchalla Date: Thu, 5 Oct 2023 12:12:40 -0400 Subject: [PATCH] Resolving PR comments --- Makefile | 6 +++--- assets/kube-burner-report-ocp-wrapper/queries.libsonnet | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ccc2cec..1b168f9 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ SYNCER_IMG_TAG ?= quay.io/cloud-bulldozer/dittybopper-syncer:latest PLATFORM = linux/amd64,linux/arm64,linux/ppc64le,linux/s390x ifeq ($(filter v2,$(MAKECMDGOALS)),v2) - # Set variables and instructions for v2 - TEMPLATES := $(wildcard $(TEMPLATESDIR)/**/*-v2.jsonnet) + # Set variables and instructions for v2 + TEMPLATES := $(wildcard $(TEMPLATESDIR)/**/*-v2.jsonnet) LIBRARY_PATH := $(TEMPLATESDIR)/vendor JSONNET := https://github.com/cloud-bulldozer/utils/releases/download/v0.0.0/jsonnet-bin-v0.20.0-linux.tar.gz else @@ -64,4 +64,4 @@ build-syncer-image: build podman build --platform=${PLATFORM} -f Dockerfile --manifest=${SYNCER_IMG_TAG} . push-syncer-image: - podman manifest push ${SYNCER_IMG_TAG} ${SYNCER_IMG_TAG} \ No newline at end of file + podman manifest push ${SYNCER_IMG_TAG} ${SYNCER_IMG_TAG} diff --git a/assets/kube-burner-report-ocp-wrapper/queries.libsonnet b/assets/kube-burner-report-ocp-wrapper/queries.libsonnet index 17b0194..1a4e13e 100644 --- a/assets/kube-burner-report-ocp-wrapper/queries.libsonnet +++ b/assets/kube-burner-report-ocp-wrapper/queries.libsonnet @@ -1203,14 +1203,14 @@ local elasticsearch = g.query.elasticsearch; + elasticsearch.bucketAggs.Terms.withId("4") + elasticsearch.bucketAggs.Terms.withType('terms') + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') + + elasticsearch.bucketAggs.Terms.settings.withOrderBy('1') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount("1") + elasticsearch.bucketAggs.Terms.settings.withSize("10"), elasticsearch.bucketAggs.Terms.withField("labels.container.keyword") + elasticsearch.bucketAggs.Terms.withId("3") + elasticsearch.bucketAggs.Terms.withType('terms') + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') + + elasticsearch.bucketAggs.Terms.settings.withOrderBy('1') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + elasticsearch.bucketAggs.Terms.settings.withSize("10"), elasticsearch.bucketAggs.DateHistogram.withField("timestamp") @@ -1289,14 +1289,14 @@ local elasticsearch = g.query.elasticsearch; + elasticsearch.bucketAggs.Terms.withId("4") + elasticsearch.bucketAggs.Terms.withType('terms') + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') + + elasticsearch.bucketAggs.Terms.settings.withOrderBy('1') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount("1") + elasticsearch.bucketAggs.Terms.settings.withSize("10"), elasticsearch.bucketAggs.Terms.withField("labels.container.keyword") + elasticsearch.bucketAggs.Terms.withId("3") + elasticsearch.bucketAggs.Terms.withType('terms') + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') + + elasticsearch.bucketAggs.Terms.settings.withOrderBy('1') + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') + elasticsearch.bucketAggs.Terms.settings.withSize("10"), elasticsearch.bucketAggs.DateHistogram.withField("timestamp")