Refactored signal files to align with the dashboards instead of grouping by category.

Author: postnati

squid-mixin/config.libsonnet

@@ -2,40 +2,32 @@
   local this = self,
 
   // Basic filtering
-  filteringSelector: 'job=~"$job", instance=~"$instance"',
+  filteringSelector: 'job="integrations/squid"',
   groupLabels: ['job'],
+  logLabels: ['job', 'instance'],
   instanceLabels: ['instance'],
 
   // Dashboard settings
-  dashboardTags: ['squid'],
+  uid: 'squid',
+  dashboardNamePrefix: 'Squid',
+  dashboardTags: [self.uid],
   dashboardPeriod: 'now-1h',
   dashboardTimezone: 'default',
   dashboardRefresh: '1m',
-  uid: 'squid',
-  dashboardNamePrefix: 'Squid',
-
+  metricsSource: 'prometheus',
+  
   // Logs configuration
   enableLokiLogs: true,
-  logLabels: ['job', 'instance', 'filename'],
-  extraLogLabels: [],
+  extraLogLabels: ['level', 'severity'],
   logsVolumeGroupBy: 'level',
   showLogsVolume: true,
 
-  // Multi-cluster support
-  enableMultiCluster: false,
-  multiclusterSelector: if self.enableMultiCluster then 'job=~"$job", cluster=~"$cluster"' else 'job=~"$job"',
-
   // Alert thresholds
   alertsCriticalHighPercentageRequestErrors: 5,  // %
   alertsWarningLowCacheHitRatio: 85,  // %
 
-  // Metrics source
-  metricsSource: 'prometheus',
-
   // Signal definitions
   signals: {
     client: (import './signals/client.libsonnet')(this),
-    server: (import './signals/server.libsonnet')(this),
-    serviceTime: (import './signals/service_time.libsonnet')(this),
   },
 }

squid-mixin/dashboards.libsonnet

@@ -1,61 +1,78 @@
 local g = import './g.libsonnet';
 local commonlib = import 'common-lib/common/main.libsonnet';
+local logslib = import 'logs-lib/logs/main.libsonnet';
 
 {
   local root = self,
   new(this):
     local prefix = this.config.dashboardNamePrefix;
     local links = this.grafana.links;
     local tags = this.config.dashboardTags;
-    local uid = this.config.uid;
-    local vars = commonlib.variables.new(
-      filteringSelector=this.config.filteringSelector,
-      groupLabels=this.config.groupLabels,
-      instanceLabels=this.config.instanceLabels,
-      varMetric='squid_server_http_requests_total',
-      customAllValue='.+',
-      enableLokiLogs=this.config.enableLokiLogs,
-    );
-    local annotations = {};
+    local uid = g.util.string.slugify(this.config.uid);
+    local vars = this.grafana.variables;
+    local annotations = this.grafana.annotations;
     local refresh = this.config.dashboardRefresh;
     local period = this.config.dashboardPeriod;
     local timezone = this.config.dashboardTimezone;
-
+    local extraLogLabels = this.config.extraLogLabels;
     {
       'squid-overview.json':
         g.dashboard.new(prefix + ' overview')
         + g.dashboard.withDescription('')
         + g.dashboard.withPanels(
           g.util.panel.resolveCollapsedFlagOnRows(
-            g.util.grid.wrapPanels(
-              [
+            g.util.grid.wrapPanels([
                 this.grafana.rows.clientRow,
                 this.grafana.rows.serverRow,
-              ]
-              +
-              if this.config.enableLokiLogs then
-                [this.grafana.rows.logsRow]
-              else
-                []
-            )
+            ])
           )
         )
         + root.applyCommon(
           vars.multiInstance,
           uid + '-overview',
           tags,
-          links,
+          links {squidOverview+:: {} },
           annotations,
           timezone,
           refresh,
           period
         ),
-    },
+    } + if this.config.enableLokiLogs then {
+      'squid-logs.json':
+        logslib.new(
+          this.config.dashboardNamePrefix + ' logs',
+          datasourceName=this.grafana.variables.datasources.loki.name,
+          datasourceRegex=this.grafana.variables.datasources.loki.regex,
+          filterSelector=this.config.filteringSelector,
+          labels=this.config.groupLabels + this.config.extraLogLabels,
+          formatParser=null,
+          showLogsVolume=this.config.showLogsVolume,
+        )
+        {
+          dashboards+:
+            {
+              logs+:
+                root.applyCommon(super.logs.templating.list, uid=uid + '-logs', tags=tags, links=links { logs+:: {} }, annotations=annotations, timezone=timezone, refresh=refresh, period=period),
+            },
+          panels+:
+            {
+              logs+:
+                g.panel.logs.options.withEnableLogDetails(true)
+                + g.panel.logs.options.withShowTime(false)
+                + g.panel.logs.options.withWrapLogMessage(false),
+            },
+          variables+: {
+            toArray+: [
+              this.grafana.variables.datasources.prometheus { hide: 2 },
+            ],
+          },
+        }.dashboards.logs,
+    } else {},
 
   applyCommon(vars, uid, tags, links, annotations, timezone, refresh, period):
     g.dashboard.withTags(tags)
     + g.dashboard.withUid(uid)
-    + g.dashboard.withLinks([links[key].asDashboardLink() for key in std.objectFields(links)])
+    + g.dashboard.withLinks(std.objectValues(links))
     + g.dashboard.withTimezone(timezone)
     + g.dashboard.withRefresh(refresh)
     + g.dashboard.time.withFrom(period)