diff --git a/grafonnet_generator/grafana/perf/jsonnet/main.libsonnet b/grafonnet_generator/grafana/perf/jsonnet/main.libsonnet index a84c376..57be910 100644 --- a/grafonnet_generator/grafana/perf/jsonnet/main.libsonnet +++ b/grafonnet_generator/grafana/perf/jsonnet/main.libsonnet @@ -5040,42 +5040,6 @@ g.dashboard.new('PerfCI-Regression-Summary-Test') //// - elasticsearch.withAlias('Max') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('bootstorm_time') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.settings.withScript('_value/1000') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') - - ]) - - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('B') - + elasticsearch.withTimeField('timestamp'), - - //// - - elasticsearch.withAlias('') + elasticsearch.withBucketAggs([ @@ -5100,138 +5064,19 @@ g.dashboard.new('PerfCI-Regression-Summary-Test') + elasticsearch.withMetrics([ elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withField('bootstorm_time') + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withPercents(['25', '50', '75', '95', '99']) + + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withPercents(['50', '90']) + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.settings.withScript('_value/1000') + elasticsearch.metrics.MetricAggregationWithSettings.Percentiles.withType('percentiles') ]) + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('C') - + elasticsearch.withTimeField('timestamp'), - - //// - - - elasticsearch.withAlias('AVG. 100 vms {{term node.keyword}}') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.Terms.withField('node.keyword') - + elasticsearch.bucketAggs.Terms.withId('4') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('asc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Average.withField('bootstorm_time') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.settings.withScript('_value/1000') - + elasticsearch.metrics.MetricAggregationWithSettings.Average.withType('avg') - - ]) - - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('D') - + elasticsearch.withTimeField('timestamp'), - - - //// - - - - elasticsearch.withAlias('%CPU [240 cores]') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('total_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') - - ]) - - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('E') - + elasticsearch.withTimeField('timestamp'), - - //// - - - elasticsearch.withAlias('%CPU worker-0 [80 cores]') - - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-0_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') - - ]) - - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('F') + + elasticsearch.withRefId('B') + elasticsearch.withTimeField('timestamp'), - //// + /// - - elasticsearch.withAlias('%CPU worker-1 [80 cores]') + elasticsearch.withAlias('Max') + elasticsearch.withBucketAggs([ elasticsearch.bucketAggs.Terms.withField('scale') @@ -5253,51 +5098,21 @@ g.dashboard.new('PerfCI-Regression-Summary-Test') + elasticsearch.withHide(false) + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-1_CPU') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('bootstorm_time') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) + + elasticsearch.metrics.MetricAggregationWithSettings.Max.settings.withScript('_value/1000') + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') ]) + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('G') + + elasticsearch.withRefId('C') + elasticsearch.withTimeField('timestamp'), //// - elasticsearch.withAlias('%CPU worker-2 [80 cores]') - + elasticsearch.withBucketAggs([ - elasticsearch.bucketAggs.Terms.withField('scale') - + elasticsearch.bucketAggs.Terms.withId('3') - + elasticsearch.bucketAggs.Terms.settings.withMinDocCount('1') - + elasticsearch.bucketAggs.Terms.settings.withOrder('desc') - + elasticsearch.bucketAggs.Terms.settings.withOrderBy('_term') - + elasticsearch.bucketAggs.Terms.settings.withSize('10') - + elasticsearch.bucketAggs.Terms.withType('terms'), - - elasticsearch.bucketAggs.DateHistogram.withField('timestamp') - + elasticsearch.bucketAggs.DateHistogram.withId('2') - + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') - + elasticsearch.bucketAggs.DateHistogram.withType('date_histogram') - - - ]) - + elasticsearch.withHide(false) - - + elasticsearch.withMetrics([ - elasticsearch.metrics.MetricAggregationWithSettings.Max.withField('worker-2_CPU') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withId('1') - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withSettings({}) - + elasticsearch.metrics.MetricAggregationWithSettings.Max.withType('max') - - ]) - - + elasticsearch.withQuery('scale:240 AND ocp_version:$ocp_version') - + elasticsearch.withRefId('H') - + elasticsearch.withTimeField('timestamp'), ////