v5.0.2

netdata · May 15, 2024 · 96a121a · 96a121a
1 parent 20f7867
commit 96a121a
Show file tree

Hide file tree

Showing 10 changed files with 164 additions and 502 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netdata/charts",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Netdata frontend SDK and chart utilities",
   "main": "dist/index.js",
   "module": "dist/es6/index.js",

diff --git a/src/helpers/units/all.js b/src/helpers/units/all.js
@@ -350,25 +350,27 @@ export default {
     },
     Kibit: {
       symbol: "Kibit",
-      name: "kibibit",
-      print_symbol: "Kibit",
+      name: "kilobit",
+      print_symbol: "kb",
       is_metric: true,
       is_special: false,
       is_additive: true,
-      is_binary: true,
+      is_binary: false,
+      is_bit: true,
       base_unit: "bit",
-      prefix_symbol: "Ki",
+      prefix_symbol: "k",
     },
     "Kibit/s": {
       symbol: "Kibit/s",
-      name: "kibibit per second",
-      print_symbol: "Kibit/s",
+      name: "kilobit per second",
+      print_symbol: "kb/s",
       is_metric: true,
       is_special: false,
       is_additive: true,
-      is_binary: true,
+      is_binary: false,
+      is_bit: true,
       base_unit: "bit/s",
-      prefix_symbol: "Ki",
+      prefix_symbol: "k",
     },
     MHz: {
       symbol: "MHz",
@@ -405,14 +407,15 @@ export default {
     },
     "Mibit/s": {
       symbol: "Mibit/s",
-      name: "mebibit per second",
-      print_symbol: "Mibit/s",
+      name: "megabit per second",
+      print_symbol: "mb/s",
       is_metric: true,
       is_special: false,
       is_additive: true,
-      is_binary: true,
+      is_binary: false,
+      is_bit: true,
       base_unit: "bit/s",
-      prefix_symbol: "Mi",
+      prefix_symbol: "M",
     },
     V: {
       symbol: "V",
@@ -475,7 +478,8 @@ export default {
       is_metric: true,
       is_special: false,
       is_additive: true,
-      is_binary: true,
+      is_binary: false,
+      is_bit: true,
     },
     "bit/s": {
       symbol: "bit/s",
@@ -484,7 +488,8 @@ export default {
       is_metric: true,
       is_special: false,
       is_additive: true,
-      is_binary: true,
+      is_binary: false,
+      is_bit: true,
     },
     "c[CPU]": {
       symbol: "c[CPU]",
@@ -508,6 +513,33 @@ export default {
       base_unit: "B[mW]",
       prefix_symbol: "d",
     },
+    d: {
+      symbol: "d",
+      name: "day",
+      print_symbol: "d",
+      is_metric: false,
+      is_special: false,
+      is_additive: true,
+      is_binary: false,
+    },
+    mo: {
+      symbol: "mo",
+      name: "month",
+      print_symbol: "Mo",
+      is_metric: false,
+      is_special: false,
+      is_additive: true,
+      is_binary: false,
+    },
+    a: {
+      symbol: "a",
+      name: "year",
+      print_symbol: "yr",
+      is_metric: false,
+      is_special: false,
+      is_additive: true,
+      is_binary: false,
+    },
     h: {
       symbol: "h",
       name: "hour",
@@ -517,6 +549,15 @@ export default {
       is_additive: true,
       is_binary: false,
     },
+    wk: {
+      symbol: "wk",
+      name: "week",
+      print_symbol: "wk",
+      is_metric: false,
+      is_special: false,
+      is_additive: true,
+      is_binary: false,
+    },
     "m[CPU]": {
       symbol: "m[CPU]",
       name: "milliCPU",
@@ -3668,7 +3709,6 @@ export default {
     "keys/s": "{key}/s",
     "KiB/operation": "KiBy/{operation}",
     "KiB/s": "KiBy/s",
-    "Kibit/s": "Kibit/s",
     "kills/s": "{kill}/s",
     "kilobits/s": "Kibit/s",
     "listeners/s": "{listener}/s",

diff --git a/src/helpers/units/conversableUnits.js b/src/helpers/units/conversableUnits.js
@@ -45,40 +45,126 @@ export default {
       convert: value => (value * 9) / 5 + 32,
     },
   },
-  s: {
-    nanoseconds: {
-      check: (chart, max) => chart.getAttribute("secondsAsTime") && max < 0.000001,
-      convert: twoFixed(1000_000_000),
+  ns: {
+    ns: {
+      check: (chart, max) => chart.getAttribute("secondsAsTime") && max < 1_000,
+      convert: function (nanoseconds) {
+        let tms = Math.round(nanoseconds * 10)
+        nanoseconds = Math.floor(tms / 10)
+
+        tms -= nanoseconds * 10
+
+        return `${nanoseconds}.${zeropad(tms)}`
+      },
+    },
+    us: {
+      check: (chart, max) =>
+        chart.getAttribute("secondsAsTime") && max >= 1_000 && max < 1_000 * 1_000,
+      convert: function (nanoseconds) {
+        nanoseconds = Math.round(nanoseconds)
+
+        let microseconds = Math.floor(nanoseconds / 1_000)
+        nanoseconds -= microseconds * 1_000
+
+        nanoseconds = Math.round(nanoseconds / 10)
+
+        return `${microseconds}.${zeropad(nanoseconds)}`
+      },
+    },
+    ms: {
+      check: (chart, max) =>
+        chart.getAttribute("secondsAsTime") && max >= 1_000 * 1_000 && max < 1_000 * 1_000 * 1_000,
+      convert: function (nanoseconds) {
+        nanoseconds = Math.round(nanoseconds)
+
+        let milliseconds = Math.floor(nanoseconds / 1_000 / 1_000)
+        nanoseconds -= milliseconds * 1_000 * 1_000
+
+        nanoseconds = Math.round(nanoseconds / 1_000 / 10)
+
+        return `${milliseconds}.${zeropad(nanoseconds)}`
+      },
+    },
+    s: {
+      check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 1_000 * 1_000 * 1_000,
+      convert: nanoseconds => {
+        nanoseconds = Math.round(nanoseconds)
+
+        let seconds = Math.floor(nanoseconds / 1_000 / 1_000 / 1_000)
+        nanoseconds -= seconds * 1_000 * 1_000 * 1_000
+
+        nanoseconds = Math.round(nanoseconds / 1_000 / 1_000 / 10)
+
+        return `${seconds}.${zeropad(nanoseconds)}`
+      },
+    },
+  },
+  ms: {
+    us: {
+      check: (chart, max) => chart.getAttribute("secondsAsTime") && max < 1,
+      convert: twoFixed(1_000),
+    },
+    ms: {
+      check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 1 && max < 1_000,
+      convert: twoFixed(),
+    },
+    s: {
+      check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 1_000 && max < 60_000,
+      convert: twoFixed(0.001),
+    },
+    min: {
+      check: (chart, max) =>
+        chart.getAttribute("secondsAsTime") && max >= 60_000 && max < 3_600_000,
+      convert: value => seconds2time(value / 1_000, "MINUTES"),
+    },
+    h: {
+      check: (chart, max) =>
+        chart.getAttribute("secondsAsTime") && max >= 3_600_000 && max < 86_400_000,
+      convert: value => seconds2time(value / 1_000, "HOURS"),
     },
-    microseconds: {
+    d: {
+      check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 86_400_000,
+      convert: value => seconds2time(value / 1_000, "DAYS"),
+    },
+    mo: {
+      check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 86_400_000 * 30,
+      convert: value => seconds2time(value, "DAYS"),
+    },
+    a: {
+      check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 86_400_000 * 30 * 12,
+      convert: value => seconds2time(value, "DAYS"),
+    },
+  },
+  s: {
+    us: {
       check: (chart, max) => chart.getAttribute("secondsAsTime") && max < 0.001,
       convert: twoFixed(1000_000),
     },
-    milliseconds: {
+    ms: {
       check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 0.001 && max < 1,
       convert: twoFixed(1000),
     },
-    seconds: {
+    s: {
       check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 1 && max < 60,
       convert: twoFixed(1),
     },
-    "duration (minutes, seconds)": {
+    min: {
       check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 60 && max < 3_600,
       convert: value => seconds2time(value, "MINUTES"),
     },
-    "duration (hours, minutes)": {
+    h: {
       check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 3_600 && max < 86_400,
       convert: value => seconds2time(value, "HOURS"),
     },
-    "duration (days, hours)": {
+    d: {
       check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 86_400,
       convert: value => seconds2time(value, "DAYS"),
     },
-    "duration (months, days)": {
+    mo: {
       check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 86_400 * 30,
       convert: value => seconds2time(value, "DAYS"),
     },
-    "duration (years, months)": {
+    a: {
       check: (chart, max) => chart.getAttribute("secondsAsTime") && max >= 86_400 * 30 * 12,
       convert: value => seconds2time(value, "DAYS"),
     },

diff --git a/src/helpers/units/index.js b/src/helpers/units/index.js
@@ -9,6 +9,7 @@ export const getUnitConfig = u =>
     is_additive: true,
     is_metric: true,
     is_binary: false,
+    is_bit: false,
   }
 
 const findCurly = u => {
@@ -29,26 +30,28 @@ export const isAdditive = u =>
   typeof u === "string" ? getUnitConfig(u).is_additive : u.is_additive
 export const isMetric = u => (typeof u === "string" ? getUnitConfig(u).is_metric : u.is_metric)
 export const isBinary = u => (typeof u === "string" ? getUnitConfig(u).is_binary : u.is_binary)
+export const isBit = u => (typeof u === "string" ? getUnitConfig(u).is_bit : u.is_bit)
 
 export const getScales = u => {
   if (!isAdditive(u)) return [[], {}]
   if (isBinary(u)) return [[...keys.binary], scalableUnits.binary]
   if (!isMetric(u)) return [[...keys.decimal], scalableUnits.decimal]
+  if (isBit(u)) return [[...keys.bit], scalableUnits.num]
 
   return [[...keys.num], scalableUnits.num]
 }
 
 const labelify = (base, config, long) => {
   if (!config || !base) return base
-  if (long) return config.name || base
-  return config.print_symbol || base
+  if (long) return typeof config.name === "undefined" ? base : config.name
+  return typeof config.print_symbol === "undefined" ? base : config.print_symbol
 }
 
 export const getUnitsString = (u, prefix = "", base = "", long) => {
   if (!isAdditive(u)) return base
 
-  if (isMetric(u) || isBinary(u))
-    return `${labelify(prefix, allUnits.prefixes[prefix], long)}${isBinary(u) ? "" : " "}${labelify(base, u, long)}`.trim()
+  if (isMetric(u) || isBinary(u) || isBit(u))
+    return `${labelify(prefix, allUnits.prefixes[prefix], long)}${isBinary(u) || isBit(u) ? "" : " "}${labelify(base, u, long)}`.trim()
 
   return `${labelify(prefix, allUnits.decimal_prefixes[prefix], long)} ${labelify(base, u, long)}`.trim()
 }

diff --git a/src/helpers/units/scalableUnits.js b/src/helpers/units/scalableUnits.js
@@ -1,6 +1,7 @@
 export const keys = {
   binary: ["Ki", "Mi", "Gi", "Ti"],
   decimal: ["K", "M", "B", "T"],
+  bit: ["k", "M", "G", "T", "P", "E", "Z", "Y"],
   num: [
     "y",
     "z",

diff --git a/src/sdk/plugins/unitConversion/getConversionUnits.js b/src/sdk/plugins/unitConversion/getConversionUnits.js
@@ -15,7 +15,7 @@ const scalable = (units, delta, desiredUnits) => {
     if (desiredScales) {
       return [
         "adjust",
-        value => (value / (scaleByKey[prefix] || 1)) * (scaleByKey[desiredPrefix] || 1),
+        value => (value * (scaleByKey[prefix] || 1)) / (scaleByKey[desiredPrefix] || 1),
         desiredPrefix,
         desiredBase,
       ]
@@ -27,7 +27,7 @@ const scalable = (units, delta, desiredUnits) => {
   return scale
     ? [
         "adjust",
-        value => (value / (scaleByKey[prefix] || 1)) * (scaleByKey[scale] || 1),
+        value => (value * (scaleByKey[prefix] || 1)) / (scaleByKey[scale] || 1),
         scale,
         base,
       ]

diff --git a/src/sdk/plugins/unitConversion/index.js b/src/sdk/plugins/unitConversion/index.js
@@ -19,8 +19,6 @@ const baseConvert = (chart, unitsKey = "units", min, max) => {
 
   const unitsStsByContext = chart.getAttribute(`${unitsKey}StsByContext`)
 
-  console.log(unitsStsByContext)
-
   chart.updateAttribute(
     `${unitsKey}ByContext`,
     Object.keys(unitsStsByContext).reduce((h, ctx) => {