v5.0.11

netdata · May 20, 2024 · 48ab17a · 48ab17a
1 parent a6c5420
commit 48ab17a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@netdata/charts",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "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
@@ -313,15 +313,6 @@ export default {
       is_scalable: true,
       is_binary: true,
     },
-    "By/{operation}": {
-      symbol: "By/{operation}",
-      name: "bytes per operation",
-      print_symbol: "B/operation",
-      is_metric: true,
-      is_special: false,
-      is_scalable: true,
-      is_binary: true,
-    },
     Cel: {
       symbol: "Cel",
       name: "degrees Celsius",
@@ -382,17 +373,6 @@ export default {
       base_unit: "By/s",
       prefix_symbol: "Ki",
     },
-    "KiBy/{operation}": {
-      symbol: "KiBy/{operation}",
-      name: "kibibytes per operation",
-      print_symbol: "KiB/operation",
-      is_metric: true,
-      is_special: false,
-      is_scalable: true,
-      is_binary: true,
-      base_unit: "By/{operation}",
-      prefix_symbol: "Ki",
-    },
     Kibit: {
       symbol: "Kibit",
       name: "kilobits",
@@ -1122,7 +1102,7 @@ export default {
     "{connection}": {
       symbol: "{connection}",
       name: "connections",
-      print_symbol: "connections",
+      print_symbol: "conns",
       is_metric: false,
       is_special: false,
       is_scalable: true,
@@ -1131,7 +1111,7 @@ export default {
     "{connection}/s": {
       symbol: "{connection}/s",
       name: "connections per second",
-      print_symbol: "connections/s",
+      print_symbol: "conns/s",
       is_metric: false,
       is_special: false,
       is_scalable: true,
@@ -1167,7 +1147,7 @@ export default {
     "{context switch}/s": {
       symbol: "{context switch}/s",
       name: "context switches per second",
-      print_symbol: "context switches/s",
+      print_symbol: "ctx switches/s",
       is_metric: false,
       is_special: false,
       is_scalable: true,
@@ -1185,7 +1165,7 @@ export default {
     "{context}": {
       symbol: "{context}",
       name: "contexts",
-      print_symbol: "contexts",
+      print_symbol: "ctx",
       is_metric: false,
       is_special: false,
       is_scalable: true,
@@ -2400,7 +2380,7 @@ export default {
     "{operation}/s": {
       symbol: "{operation}/s",
       name: "operations per second",
-      print_symbol: "operations/s",
+      print_symbol: "ops/s",
       is_metric: false,
       is_special: false,
       is_scalable: true,
@@ -3626,7 +3606,7 @@ export default {
     "attempts/s": "{attempt}/s",
     "authentications/s": "{authentication}/s",
     "B(mW)": "B[mW]",
-    "B/operation": "By/{operation}",
+    "B/operation": "By",
     "B/s": "By/s",
     "bans/s": "{ban}/s",
     "batches/s": "{batch}/s",
@@ -3701,7 +3681,7 @@ export default {
     "jobs/s": "{job}/s",
     "joins/s": "{join}/s",
     "keys/s": "{key}/s",
-    "KiB/operation": "KiBy/{operation}",
+    "KiB/operation": "KiBy",
     "KiB/s": "KiBy/s",
     "kills/s": "{kill}/s",
     "kilobits/s": "Kibit/s",

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

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