update links, fix conversion (#1096)

Author: Caleb-Hurshman

apache-hbase-mixin/README.md

@@ -11,7 +11,6 @@ The Apache HBase mixin contains the following dashboards:
 and the following alerts:
 
 - HBaseHighHeapMemUsage
-- HBaseHighNonHeapMemUsage
 - HBaseDeadRegionServer
 - HBaseOldRegionsInTransition
 - HBaseHighMasterAuthFailureRate
@@ -28,12 +27,13 @@ The Apache HBase RegionServer overview dashboard provides details on data region
 
 ![First screenshot of the Apache HBase RegionServer overview dashboard](https://storage.googleapis.com/grafanalabs-integration-assets/apache-hbase/screenshots/apache_hbase_region_server_overview_1.png)
 ![Second screenshot of the Apache HBase RegionServer overview dashboard](https://storage.googleapis.com/grafanalabs-integration-assets/apache-hbase/screenshots/apache_hbase_region_server_overview_2.png)
+![Third screenshot of the Apache HBase RegionServer overview dashboard](https://storage.googleapis.com/grafanalabs-integration-assets/apache-hbase/screenshots/apache_hbase_region_server_overview_3.png)
 
 
 ## Apache HBase logs
 The Apache HBase logs dashboard provides details on incoming system logs.
 
-![First screenshot of the Apache HBase logs dashboard](https://storage.googleapis.com/grafanalabs-integration-assets/apache-hbase/screenshots/apache_hbase_logs_1.png)
+![First screenshot of the Apache HBase logs dashboard](https://storage.googleapis.com/grafanalabs-integration-assets/apache-hbase/screenshots/apache_hbase_logs_overview_1.png)
 
 Apache HBase system logs are enabled by default in the `config.libsonnet` and can be removed by setting `enableLokiLogs` to `false`. Then run `make` again to regenerate the dashboard:
 
@@ -70,7 +70,6 @@ scrape_configs:
 ## Alerts overview
 
 - ApacheHBaseHighHeapMemUsage: There is a limited amount of heap memory available to the JVM.
-- ApacheHBaseHighNonHeapMemUsage: There is a limited amount of non-heap memory available to the JVM.
 - ApacheHBaseDeadRegionServer: One or more RegionServer(s) has become unresponsive.
 - ApacheHBaseOldRegionsInTransition: RegionServers are in transition for longer than expected.
 - ApacheHBaseHighMasterAuthFailureRate: A high percentage of authentication attempts to the master are failing.
@@ -82,7 +81,6 @@ Default thresholds can be configured in `config.libsonnet`.
 {
   _config+:: {
     alertsHighHeapMemUsage: 80        // percentage
-    alertsHighNonHeapMemUsage: 80     // percentage
     alertsDeadRegionServer: 0         // count
     alertsOldRegionsInTransition: 50  // percentage
     alertsHighMasterAuthFailRate: 35  // percentage

apache-hbase-mixin/dashboards/apache-hbase-cluster-overview.libsonnet

@@ -89,19 +89,19 @@ local masterStatusHistoryPanel = {
   transformations: [],
 };
 
-local deadRegionServersPanel = {
+local liveRegionServersPanel = {
   datasource: promDatasource,
   targets: [
     prometheus.target(
-      'server_num_dead_region_servers{job=~"$job", hbase_cluster=~"$hbase_cluster", isactivemaster="true"}',
+      'server_num_region_servers{job=~"$job", hbase_cluster=~"$hbase_cluster", isactivemaster="true"}',
       datasource=promDatasource,
       legendFormat='{{hbase_cluster}}',
       format='time_series',
     ),
   ],
   type: 'stat',
-  title: 'Dead RegionServers',
-  description: 'Number of RegionServers that are currently dead.',
+  title: 'Live RegionServers',
+  description: 'Number of RegionServers that are currently live.',
   fieldConfig: {
     defaults: {
       color: {
@@ -114,10 +114,6 @@ local deadRegionServersPanel = {
           {
             color: 'green',
           },
-          {
-            color: 'red',
-            value: 1,
-          },
         ],
       },
     },
@@ -140,19 +136,19 @@ local deadRegionServersPanel = {
   pluginVersion: '10.3.0-62488',
 };
 
-local liveRegionServersPanel = {
+local deadRegionServersPanel = {
   datasource: promDatasource,
   targets: [
     prometheus.target(
-      'server_num_region_servers{job=~"$job", hbase_cluster=~"$hbase_cluster", isactivemaster="true"}',
+      'server_num_dead_region_servers{job=~"$job", hbase_cluster=~"$hbase_cluster", isactivemaster="true"}',
       datasource=promDatasource,
       legendFormat='{{hbase_cluster}}',
       format='time_series',
     ),
   ],
   type: 'stat',
-  title: 'Live RegionServers',
-  description: 'Number of RegionServers that are currently live.',
+  title: 'Dead RegionServers',
+  description: 'Number of RegionServers that are currently dead.',
   fieldConfig: {
     defaults: {
       color: {
@@ -165,6 +161,10 @@ local liveRegionServersPanel = {
           {
             color: 'green',
           },
+          {
+            color: 'red',
+            value: 1,
+          },
         ],
       },
     },
@@ -195,12 +195,14 @@ local serversPanel = {
       datasource=promDatasource,
       legendFormat='{{hbase_cluster}}',
       format='table',
+      instant=true,
     ),
     prometheus.target(
       'label_replace(server_num_reference_files{job=~"$job", hbase_cluster=~"$hbase_cluster"}, "region_server_instance", "$1", "instance", "(.+)")',
       datasource=promDatasource,
-      legendFormat='',
+      legendFormat='{{hbase_cluster}}',
       format='table',
+      instant=true,
     ),
   ],
   type: 'table',
@@ -412,7 +414,7 @@ local alertsPanel = {
   },
 };
 
-local jvmMemoryUsagePanel = {
+local jvmHeapMemoryUsagePanel = {
   datasource: promDatasource,
   targets: [
     prometheus.target(
@@ -423,8 +425,8 @@ local jvmMemoryUsagePanel = {
     ),
   ],
   type: 'timeseries',
-  title: 'JVM memory usage',
-  description: 'Memory usage for the JVM.',
+  title: 'JVM heap memory usage',
+  description: 'Heap memory usage for the JVM.',
   fieldConfig: {
     defaults: {
       color: {
@@ -1102,11 +1104,11 @@ local oldestRegionInTransitionPanel = {
       .addPanels(
         [
           masterStatusHistoryPanel { gridPos: { h: 6, w: 24, x: 0, y: 0 } },
-          deadRegionServersPanel { gridPos: { h: 8, w: 5, x: 0, y: 6 } },
-          liveRegionServersPanel { gridPos: { h: 8, w: 5, x: 5, y: 6 } },
+          liveRegionServersPanel { gridPos: { h: 8, w: 5, x: 0, y: 6 } },
+          deadRegionServersPanel { gridPos: { h: 8, w: 5, x: 5, y: 6 } },
           serversPanel { gridPos: { h: 8, w: 14, x: 10, y: 6 } },
           alertsPanel { gridPos: { h: 8, w: 12, x: 0, y: 14 } },
-          jvmMemoryUsagePanel { gridPos: { h: 8, w: 12, x: 12, y: 14 } },
+          jvmHeapMemoryUsagePanel { gridPos: { h: 8, w: 12, x: 12, y: 14 } },
           connectionsPanel { gridPos: { h: 8, w: 12, x: 0, y: 22 } },
           authenticationsPanel { gridPos: { h: 8, w: 12, x: 12, y: 22 } },
           masterQueueSizePanel { gridPos: { h: 8, w: 12, x: 0, y: 30 } },

apache-hbase-mixin/dashboards/apache-hbase-regionserver-overview.libsonnet

@@ -157,7 +157,7 @@ local storeFileSizePanel = {
     minVizHeight: 10,
     minVizWidth: 0,
     namePlacement: 'auto',
-    orientation: 'horizontal',
+    orientation: 'vertical',
     reduceOptions: {
       calcs: [
         'lastNotNull',
@@ -226,7 +226,7 @@ local jvmHeapMemoryUsagePanel = {
     prometheus.target(
       'jvm_metrics_mem_heap_used_m{job=~"$job", hbase_cluster=~"$hbase_cluster", instance=~"$instance", processname="RegionServer"} / clamp_min(jvm_metrics_mem_heap_committed_m{job=~"$job", hbase_cluster=~"$hbase_cluster", instance=~"$instance", processname="RegionServer"}, 1)',
       datasource=promDatasource,
-      legendFormat='{{instance}} - heap',
+      legendFormat='{{instance}}',
       format='time_series',
     ),
   ],
@@ -730,7 +730,7 @@ local storeFileCountPanel = {
   },
 };
 
-local storeFileSizePanel = {
+local storeFileSizeTimeseriesPanel = {
   datasource: promDatasource,
   targets: [
     prometheus.target(
@@ -1289,7 +1289,7 @@ local authenticationsPanel = {
           regionCountPanel { gridPos: { h: 8, w: 12, x: 0, y: 16 } },
           rpcConnectionCountPanel { gridPos: { h: 8, w: 12, x: 12, y: 16 } },
           storeFileCountPanel { gridPos: { h: 8, w: 12, x: 0, y: 24 } },
-          storeFileSizePanel { gridPos: { h: 8, w: 12, x: 12, y: 24 } },
+          storeFileSizeTimeseriesPanel { gridPos: { h: 8, w: 12, x: 12, y: 24 } },
           queuedCallsPanel { gridPos: { h: 8, w: 12, x: 0, y: 32 } },
           slowOperationsPanel { gridPos: { h: 8, w: 12, x: 12, y: 32 } },
           cacheHitPercentagePanel { gridPos: { h: 8, w: 12, x: 0, y: 40 } },