pr feedback

Author: schmikei

apache-hbase-mixin/alerts.libsonnet

@@ -41,7 +41,7 @@
           {
             alert: 'HBaseOldRegionsInTransition',
             expr: |||
-              100 * assignment_manager_rit_count_over_threshold / clamp_min(assignment_manager_rit_count, 1) > %(alertsOldRegionsInTransition)s
+              100 * assignment_manager_rit_count_over_threshold / clamp_min(assignment_manager_rit_count{%(filteringSelector)s}, 1) > %(alertsOldRegionsInTransition)s
             ||| % this.config,
             'for': '5m',
             labels: {
@@ -58,7 +58,7 @@
           {
             alert: 'HBaseHighMasterAuthFailRate',
             expr: |||
-              100 * rate(master_authentication_failures[5m]) / (clamp_min(rate(master_authentication_successes[5m]), 1) + clamp_min(rate(master_authentication_failures[5m]), 1)) > %(alertsHighMasterAuthFailRate)s
+              100 * rate(master_authentication_failures[5m]) / (clamp_min(rate(master_authentication_successes{%(filteringSelector)s}[5m]), 1) + clamp_min(rate(master_authentication_failures{%(filteringSelector)s}[5m]), 1)) > %(alertsHighMasterAuthFailRate)s
             ||| % this.config,
             'for': '5m',
             labels: {
@@ -75,7 +75,7 @@
           {
             alert: 'HBaseHighRSAuthFailRate',
             expr: |||
-              100 * rate(region_server_authentication_failures[5m]) / (clamp_min(rate(region_server_authentication_successes[5m]), 1) + clamp_min(rate(region_server_authentication_failures[5m]), 1)) > %(alertsHighRSAuthFailRate)s
+              100 * rate(region_server_authentication_failures[5m]) / (clamp_min(rate(region_server_authentication_successes{%(filteringSelector)s}[5m]), 1) + clamp_min(rate(region_server_authentication_failures{%(filteringSelector)s}[5m]), 1)) > %(alertsHighRSAuthFailRate)s
             ||| % this.config,
             'for': '5m',
             labels: {

apache-hbase-mixin/dashboards.libsonnet

@@ -75,7 +75,7 @@ local logslib = import 'logs-lib/logs/main.libsonnet';
             dashboards+:
               {
                 logs+:
-                  root.applyCommon(super.logs.templating.list, uid=uid + '_logs', tags=tags, links=links { logs+:: {} }, annotations=annotations, timezone=timezone, refresh=refresh, period=period),
+                  root.applyCommon(super.logs.templating.list, uid=uid + '-logs', tags=tags, links=links { logs+:: {} }, annotations=annotations, timezone=timezone, refresh=refresh, period=period),
               },
             panels+:
               {

apache-hbase-mixin/dashboards_out/apache-hbase-cluster-overview.json

@@ -11,7 +11,7 @@ local hbase = hbaselib.new()
                 },
               );
 
-local optional_lablels = {
+local optional_labels = {
   cluster+: {
     allValue: '.*',
   },
@@ -24,7 +24,7 @@ local optional_lablels = {
   grafanaDashboards+:: {
     [fname]:
       local dashboard = hbase.grafana.dashboards[fname];
-      dashboard + util.patch_variables(dashboard, optional_lablels)
+      dashboard + util.patch_variables(dashboard, optional_labels)
     for fname in std.objectFields(hbase.grafana.dashboards)
   },
   prometheusAlerts+:: hbase.prometheus.alerts,

apache-hbase-mixin/dashboards_out/apache-hbase-logs-overview.json renamed to apache-hbase-mixin/dashboards_out/apache-hbase-logs.json

@@ -151,7 +151,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
             g.panel.table.standardOptions.withLinks([
               {
                 title: '',
-                url: '/d/apachehbase-regionserver-overview?from=${__from}&to=${__to}&var-instance=${__data.fields["RegionServer"]}',
+                url: '/d/'+ this.grafana.dashboards['apache-hbase-regionserver-overview.json'].uid + '?from=${__from}&to=${__to}&var-instance=${__data.fields["RegionServer"]}',
               },
             ])
           ),
@@ -290,23 +290,23 @@ local commonlib = import 'common-lib/common/main.libsonnet';
       regionsPanel:
         commonlib.panels.generic.stat.info.new(
           'Regions',
-          targets=[signals.regionserver.regionCount.asTarget()],
+          targets=[signals.regionserver.regionCountAggregated.asTarget()],
           description='The number of regions hosted by the RegionServer.'
         )
         + g.panel.stat.standardOptions.withUnit('short'),
 
       storeFilesPanel:
         commonlib.panels.generic.stat.info.new(
           'Store files',
-          targets=[signals.regionserver.storeFileCount.asTarget()],
+          targets=[signals.regionserver.storeFileCountAggregated.asTarget()],
           description='The number of store files on disk currently managed by the RegionServer.'
         )
         + g.panel.stat.standardOptions.withUnit('short'),
 
       storeFileSizePanel:
         commonlib.panels.generic.stat.info.new(
           'Store file size',
-          targets=[signals.regionserver.storeFileSize.asTarget()],
+          targets=[signals.regionserver.storeFileSizeAggregated.asTarget()],
           description='The total size of the store files on disk managed by the RegionServer.'
         )
         + g.panel.stat.standardOptions.withUnit('decbytes'),
@@ -315,7 +315,7 @@ local commonlib = import 'common-lib/common/main.libsonnet';
       rpcConnectionsPanel:
         commonlib.panels.generic.stat.info.new(
           'RPC connections',
-          targets=[signals.regionserver.rpcConnections.asTarget()],
+          targets=[signals.regionserver.rpcConnectionsAggregated.asTarget()],
           description='The number of open connections to the RegionServer.'
         )
         + g.panel.stat.standardOptions.withUnit('short'),
@@ -453,8 +453,8 @@ local commonlib = import 'common-lib/common/main.libsonnet';
         commonlib.panels.generic.timeSeries.base.new(
           'Authentications',
           targets=[
-            signals.regionserver.regionServerAuthenticationSuccess.asTarget(),
-            signals.regionserver.regionServerAuthenticationFailure.asTarget(),
+            signals.cluster.regionServerAuthenticationSuccess.asTarget(),
+            signals.cluster.regionServerAuthenticationFailure.asTarget(),
           ],
           description='The rate of successful and unsuccessful authentications.'
         )