Merge pull request #163 from consideRatio/pr/cpu-units

Change CPU panels' units from percent to sishort (20% -> 200m)

Author: jnywong

dashboards/group.jsonnet

@@ -61,13 +61,15 @@ local cpuUsage =
     |||
       Per group CPU usage
 
+      The measured unit are CPU cores, and they are written out with SI prefixes, so 100m means 0.1 CPU cores.
+
       User groups are derived from authenticator managed groups where available, e.g. GitHub teams. If a user is a member of multiple groups, then they will be assigned to the group 'other' by default. 
 
       Requires https://github.com/2i2c-org/jupyterhub-groups-exporter to
       be set up. If the panels show no data, then please try selecting another time range where usage was active.
     |||
   )
-  + ts.standardOptions.withUnit('percentunit')
+  + ts.standardOptions.withUnit('sishort')
   + ts.queryOptions.withTargets([
     prometheus.new(
       '$PROMETHEUS_DS',
@@ -205,13 +207,15 @@ local cpuRequests =
     |||
       Per group CPU requests
 
+      The measured unit are CPU cores, and they are written out with SI prefixes, so 100m means 0.1 CPU cores.
+
       User groups are derived from authenticator managed groups where available, e.g. GitHub teams. If a user is a member of multiple groups, then they will be assigned to the group 'other' by default. 
 
       Requires https://github.com/2i2c-org/jupyterhub-groups-exporter to
       be set up. If the panels show no data, then please try selecting another time range where usage was active.
     |||
   )
-  + ts.standardOptions.withUnit('percentunit')
+  + ts.standardOptions.withUnit('sishort')
   + ts.queryOptions.withTargets([
     prometheus.new(
       '$PROMETHEUS_DS',

dashboards/jupyterhub.libsonnet

@@ -159,6 +159,10 @@ local prometheus = grafonnet.query.prometheus;
         irate(container_cpu_usage_seconds_total{name!=""}[5m])
       |||,
     )
-    + ts.standardOptions.withDecimals(1)
-    + ts.standardOptions.withUnit('percentunit'),
+    + ts.panelOptions.withDescription(
+      |||
+        The measured unit are CPU cores, and they are written out with SI prefixes, so 100m means 0.1 CPU cores.
+      |||
+    )
+    + ts.standardOptions.withUnit('sishort'),
 }

dashboards/support.jsonnet

@@ -46,6 +46,11 @@ local nfsServerCPU =
   common.tsOptions
   + common.tsRequestLimitStylingOverrides
   + ts.new('NFS server CPU usage')
+  + ts.panelOptions.withDescription(
+    |||
+      The measured unit are CPU cores, and they are written out with SI prefixes, so 100m means 0.1 CPU cores.
+    |||
+  )
   + ts.standardOptions.withUnit('sishort')
   + ts.queryOptions.withTargets([
     prometheus.new(
@@ -156,6 +161,11 @@ local promServerCPU =
   common.tsOptions
   + common.tsRequestLimitStylingOverrides
   + ts.new('Prometheus server CPU usage')
+  + ts.panelOptions.withDescription(
+    |||
+      The measured unit are CPU cores, and they are written out with SI prefixes, so 100m means 0.1 CPU cores.
+    |||
+  )
   + ts.standardOptions.withUnit('sishort')
   + ts.queryOptions.withTargets([
     prometheus.new(

dashboards/user.jsonnet

@@ -38,9 +38,11 @@ local cpuUsage =
   + ts.panelOptions.withDescription(
     |||
       Per user CPU usage
+
+      The measured unit are CPU cores, and they are written out with SI prefixes, so 100m means 0.1 CPU cores.
     |||
   )
-  + ts.standardOptions.withUnit('percentunit')
+  + ts.standardOptions.withUnit('sishort')
   + ts.queryOptions.withTargets([
     prometheus.new(
       '$PROMETHEUS_DS',
@@ -127,9 +129,11 @@ local cpuRequests =
   + ts.panelOptions.withDescription(
     |||
       Per user CPU requests
+
+      The measured unit are CPU cores, and they are written out with SI prefixes, so 100m means 0.1 CPU cores.
     |||
   )
-  + ts.standardOptions.withUnit('percentunit')
+  + ts.standardOptions.withUnit('sishort')
   + ts.queryOptions.withTargets([
     prometheus.new(
       '$PROMETHEUS_DS',