Fix component id in remaining panels

fluxninja · Oct 20, 2023 · 04dd666 · 04dd666
1 parent 4953065
commit 04dd666
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 20 deletions.
diff --git a/blueprints/grafana/panels/accept_percentage.libsonnet b/blueprints/grafana/panels/accept_percentage.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local timeSeriesPanel = import '../utils/time_series_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
   local acceptPercentage_filters = utils.dictToPrometheusFilter(stringFilters { signal_name: 'ACCEPT_PERCENTAGE' }),
 
   local acceptPercentage = timeSeriesPanel('Accept Percentage',

diff --git a/blueprints/grafana/panels/average_load_multiplier.libsonnet b/blueprints/grafana/panels/average_load_multiplier.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extra_filters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extra_filters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extra_filters { policy_name: policyName, component_id: componentID }),
 
   local avgLoadMultiplier = statPanel('Average Load Multiplier',
                                       datasourceName,

diff --git a/blueprints/grafana/panels/incoming_token_rate.libsonnet b/blueprints/grafana/panels/incoming_token_rate.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local timeSeriesPanel = import '../utils/time_series_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local incomingTokenRate = timeSeriesPanel('Incoming Token Rate',
                                             datasourceName,

diff --git a/blueprints/grafana/panels/query.libsonnet b/blueprints/grafana/panels/query.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local timeSeriesPanel = import '../utils/time_series_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
   local signalName = component.component.out_ports.output.signal_name,
   local query = component.component.query_string,
 

diff --git a/blueprints/grafana/panels/rate_limiter.libsonnet b/blueprints/grafana/panels/rate_limiter.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local timeSeriesPanel = import '../utils/time_series_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local rateLimiter = timeSeriesPanel('Aperture Rate Limiter',
                                       datasourceName,

diff --git a/blueprints/grafana/panels/request_in_queue_duration.libsonnet b/blueprints/grafana/panels/request_in_queue_duration.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local timeSeriesPanel = import '../utils/time_series_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local workloadLatency = timeSeriesPanel('Request in Queue Duration',
                                           datasourceName,

diff --git a/blueprints/grafana/panels/request_queue_duration_bar.libsonnet b/blueprints/grafana/panels/request_queue_duration_bar.libsonnet
@@ -2,7 +2,8 @@ local barChartPanel = import '../utils/bar_chart_panel.libsonnet';
 local utils = import '../utils/policy_utils.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local requestsDuration = barChartPanel('Requests in Queue Duration',
                                          datasourceName,

diff --git a/blueprints/grafana/panels/throughput.libsonnet b/blueprints/grafana/panels/throughput.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local timeSeriesPanel = import '../utils/time_series_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local throughput = timeSeriesPanel('Throughput - Accept/Reject',
                                      datasourceName,

diff --git a/blueprints/grafana/panels/token_bucket_available_tokens.libsonnet b/blueprints/grafana/panels/token_bucket_available_tokens.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extra_filters) {
-  local stringFilters = utils.dictToPrometheusFilter(extra_filters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extra_filters { policy_name: policyName, component_id: componentID }),
 
   local tokenBucketAvailableTokens = statPanel('Token Bucket Available Tokens',
                                                datasourceName,

diff --git a/blueprints/grafana/panels/token_bucket_capacity.libsonnet b/blueprints/grafana/panels/token_bucket_capacity.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extra_filters) {
-  local stringFilters = utils.dictToPrometheusFilter(extra_filters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extra_filters { policy_name: policyName, component_id: componentID }),
 
   local tokenBucketCapacity = statPanel('Token Bucket Capacity',
                                         datasourceName,

diff --git a/blueprints/grafana/panels/token_bucket_fillrate.libsonnet b/blueprints/grafana/panels/token_bucket_fillrate.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extra_filters) {
-  local stringFilters = utils.dictToPrometheusFilter(extra_filters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extra_filters { policy_name: policyName, component_id: componentID }),
 
   local tokenBucketFillrate = statPanel('Token Bucket FillRate',
                                         datasourceName,

diff --git a/blueprints/grafana/panels/total_accepted_requests.libsonnet b/blueprints/grafana/panels/total_accepted_requests.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local acceptedRequests = statPanel('Total Accepted Requests',
                                      datasourceName,

diff --git a/blueprints/grafana/panels/total_accepted_tokens.libsonnet b/blueprints/grafana/panels/total_accepted_tokens.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local acceptedTokens = statPanel('Total Accepted Tokens',
                                    datasourceName,

diff --git a/blueprints/grafana/panels/total_incoming_tokens.libsonnet b/blueprints/grafana/panels/total_incoming_tokens.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local incomingTokens = statPanel('Total Incoming Tokens',
                                    datasourceName,

diff --git a/blueprints/grafana/panels/total_rejected_requests.libsonnet b/blueprints/grafana/panels/total_rejected_requests.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local rejectedRequests = statPanel('Total Rejected Requests',
                                      datasourceName,

diff --git a/blueprints/grafana/panels/total_rejected_tokens.libsonnet b/blueprints/grafana/panels/total_rejected_tokens.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local rejectedTokens = statPanel('Total Rejected Tokens',
                                    datasourceName,

diff --git a/blueprints/grafana/panels/total_requests.libsonnet b/blueprints/grafana/panels/total_requests.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local statPanel = import '../utils/stat_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local totalRequests = statPanel('Total Requests',
                                   datasourceName,

diff --git a/blueprints/grafana/panels/wfq_scheduler_flows.libsonnet b/blueprints/grafana/panels/wfq_scheduler_flows.libsonnet
@@ -2,7 +2,8 @@ local barGaugePanel = import '../utils/bar_gauge_panel.libsonnet';
 local utils = import '../utils/policy_utils.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
 
   local legendFormat = '{{ instance }} - {{ policy_name }}',

diff --git a/blueprints/grafana/panels/wfq_scheduler_heap_requests.libsonnet b/blueprints/grafana/panels/wfq_scheduler_heap_requests.libsonnet
@@ -2,7 +2,8 @@ local barGaugePanel = import '../utils/bar_gauge_panel.libsonnet';
 local utils = import '../utils/policy_utils.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local legendFormat = '{{ instance }} - {{ policy_name }}',
 

diff --git a/blueprints/grafana/panels/workload_latency.libsonnet b/blueprints/grafana/panels/workload_latency.libsonnet
@@ -2,7 +2,8 @@ local utils = import '../utils/policy_utils.libsonnet';
 local timeSeriesPanel = import '../utils/time_series_panel.libsonnet';
 
 function(datasourceName, policyName, component, extraFilters={}) {
-  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: component.component_id }),
+  local componentID = std.get(component.component, 'load_scheduler_component_id', default=component.component_id),
+  local stringFilters = utils.dictToPrometheusFilter(extraFilters { policy_name: policyName, component_id: componentID }),
 
   local workloadLatency = timeSeriesPanel('Workload Latency',
                                           datasourceName,