Merge disk and filesystem

common-lib/README.md

@@ -1,6 +1,6 @@
 # Common lib
 
-This logs lib can be used to generate dashboards using [grafonnet](https://github.com/grafana/grafonnet).
+This common lib can be used to generate dashboards using [grafonnet](https://github.com/grafana/grafonnet).
 
 This enforces 'common style' to different panels.
 

common-lib/common/panels.libsonnet

@@ -23,12 +23,9 @@ local g = import './g.libsonnet';
     stat: import './panels/memory/stat/main.libsonnet',
     timeSeries: import './panels/memory/timeSeries/main.libsonnet',
   },
-  filesystem: {
-    timeSeries: import './panels/filesystem/timeSeries/main.libsonnet',
-    table: import './panels/filesystem/table/main.libsonnet',
-    stat: import './panels/filesystem/stat/main.libsonnet',
-  },
   disk: {
     timeSeries: import './panels/disk/timeSeries/main.libsonnet',
+    table: import './panels/disk/table/main.libsonnet',
+    stat: import './panels/disk/stat/main.libsonnet',
   },
 }

common-lib/common/panels/filesystem/timeSeries/available.libsonnet → common-lib/common/panels/disk/timeSeries/available.libsonnet

@@ -7,7 +7,7 @@ local defaults = timeSeries.fieldConfig.defaults;
 local options = timeSeries.options;
 base {
   new(
-    title='Filesystem space available',
+    title='Disk space available',
     targets,
     description='',
   ):

common-lib/common/panels/disk/timeSeries/base.libsonnet

@@ -1,5 +1,5 @@
 local g = import '../../../g.libsonnet';
-local base = import '../../all/timeSeries/base.libsonnet';
+local base = import '../../all/timeSeries/main.libsonnet';
 local timeSeries = g.panel.timeSeries;
 local fieldOverride = g.panel.timeSeries.fieldOverride;
 local custom = timeSeries.fieldConfig.defaults.custom;
@@ -11,7 +11,9 @@ base {
     targets,
     description=''
   ):
-    super.new(title, targets, description),
+    super.base.new(title, targets, description)
+    // Decrease opacity (would look better with too many timeseries)
+    + g.panel.timeSeries.fieldConfig.defaults.custom.withFillOpacity(1),
 
   withNegateOutPackets(regexp='/write|written/'):
     defaults.custom.withAxisLabel('write(-) | read(+)')

common-lib/common/panels/disk/timeSeries/main.libsonnet

@@ -4,4 +4,7 @@
   iops: import './iops.libsonnet',
   ioQueue: import './io_queue.libsonnet',
   ioWaitTime: import './io_wait_time.libsonnet',
+  available: import './available.libsonnet',
+  usage: import './usage.libsonnet',
+  usagePercent: import './usage_percent.libsonnet',
 }

common-lib/common/panels/filesystem/timeSeries/usage.libsonnet → common-lib/common/panels/disk/timeSeries/usage.libsonnet

@@ -7,7 +7,7 @@ local defaults = timeSeries.fieldConfig.defaults;
 local options = timeSeries.options;
 base {
   new(
-    title='Filesystem space used',
+    title='Disk space used',
     targets,
     description=|||
       Disk space usage is the amount of storage being used on a device's hard drive or storage medium, in bytes.

common-lib/common/panels/filesystem/timeSeries/usage_percent.libsonnet → common-lib/common/panels/disk/timeSeries/usage_percent.libsonnet

@@ -7,7 +7,7 @@ local defaults = timeSeries.fieldConfig.defaults;
 local options = timeSeries.options;
 base {
   new(
-    title='Filesystem space used, %',
+    title='Disk space used, %',
     targets,
     description=|||
       Disk space usage is the amount of storage being used on a device's hard drive or storage medium, in percent.