Browse Source

Move mdstat charts near to Disks (#11119)

Reorganize MD Array Menu.
thiagoftsm 3 years ago
parent
commit
aa087d4306
2 changed files with 38 additions and 32 deletions
  1. 33 32
      collectors/all.h
  2. 5 0
      web/gui/dashboard_info.js

+ 33 - 32
collectors/all.h

@@ -128,36 +128,47 @@
 #define NETDATA_CHART_PRIO_DISKSPACE_SPACE            2023
 #define NETDATA_CHART_PRIO_DISKSPACE_INODES           2024
 
+// MDSTAT
+
+#define NETDATA_CHART_PRIO_MDSTAT_HEALTH              2100
+#define NETDATA_CHART_PRIO_MDSTAT_NONREDUNDANT        2101
+#define NETDATA_CHART_PRIO_MDSTAT_DISKS               2102 // 5 charts per raid
+#define NETDATA_CHART_PRIO_MDSTAT_MISMATCH            2103
+#define NETDATA_CHART_PRIO_MDSTAT_OPERATION           2104
+#define NETDATA_CHART_PRIO_MDSTAT_FINISH              2105
+#define NETDATA_CHART_PRIO_MDSTAT_SPEED               2106
+
+
 // NFS (server)
 
-#define NETDATA_CHART_PRIO_NFSD_READCACHE             2100
-#define NETDATA_CHART_PRIO_NFSD_FILEHANDLES           2101
-#define NETDATA_CHART_PRIO_NFSD_IO                    2102
-#define NETDATA_CHART_PRIO_NFSD_THREADS               2103
-#define NETDATA_CHART_PRIO_NFSD_THREADS_FULLCNT       2104
-#define NETDATA_CHART_PRIO_NFSD_THREADS_HISTOGRAM     2105
-#define NETDATA_CHART_PRIO_NFSD_READAHEAD             2105
-#define NETDATA_CHART_PRIO_NFSD_NET                   2107
-#define NETDATA_CHART_PRIO_NFSD_RPC                   2108
-#define NETDATA_CHART_PRIO_NFSD_PROC2                 2109
-#define NETDATA_CHART_PRIO_NFSD_PROC3                 2110
-#define NETDATA_CHART_PRIO_NFSD_PROC4                 2111
-#define NETDATA_CHART_PRIO_NFSD_PROC4OPS              2112
+#define NETDATA_CHART_PRIO_NFSD_READCACHE             2200
+#define NETDATA_CHART_PRIO_NFSD_FILEHANDLES           2201
+#define NETDATA_CHART_PRIO_NFSD_IO                    2202
+#define NETDATA_CHART_PRIO_NFSD_THREADS               2203
+#define NETDATA_CHART_PRIO_NFSD_THREADS_FULLCNT       2204
+#define NETDATA_CHART_PRIO_NFSD_THREADS_HISTOGRAM     2205
+#define NETDATA_CHART_PRIO_NFSD_READAHEAD             2205
+#define NETDATA_CHART_PRIO_NFSD_NET                   2207
+#define NETDATA_CHART_PRIO_NFSD_RPC                   2208
+#define NETDATA_CHART_PRIO_NFSD_PROC2                 2209
+#define NETDATA_CHART_PRIO_NFSD_PROC3                 2210
+#define NETDATA_CHART_PRIO_NFSD_PROC4                 2211
+#define NETDATA_CHART_PRIO_NFSD_PROC4OPS              2212
 
 // NFS (client)
 
-#define NETDATA_CHART_PRIO_NFS_NET                    2207
-#define NETDATA_CHART_PRIO_NFS_RPC                    2208
-#define NETDATA_CHART_PRIO_NFS_PROC2                  2209
-#define NETDATA_CHART_PRIO_NFS_PROC3                  2210
-#define NETDATA_CHART_PRIO_NFS_PROC4                  2211
+#define NETDATA_CHART_PRIO_NFS_NET                    2307
+#define NETDATA_CHART_PRIO_NFS_RPC                    2308
+#define NETDATA_CHART_PRIO_NFS_PROC2                  2309
+#define NETDATA_CHART_PRIO_NFS_PROC3                  2310
+#define NETDATA_CHART_PRIO_NFS_PROC4                  2311
 
 // BTRFS
 
-#define NETDATA_CHART_PRIO_BTRFS_DISK                 2300
-#define NETDATA_CHART_PRIO_BTRFS_DATA                 2301
-#define NETDATA_CHART_PRIO_BTRFS_METADATA             2302
-#define NETDATA_CHART_PRIO_BTRFS_SYSTEM               2303
+#define NETDATA_CHART_PRIO_BTRFS_DISK                 2400
+#define NETDATA_CHART_PRIO_BTRFS_DATA                 2401
+#define NETDATA_CHART_PRIO_BTRFS_METADATA             2402
+#define NETDATA_CHART_PRIO_BTRFS_SYSTEM               2403
 
 // ZFS
 
@@ -308,16 +319,6 @@
 #define NETDATA_CHART_PRIO_SYNPROXY_CONN_OPEN         8753
 #define NETDATA_CHART_PRIO_SYNPROXY_ENTRIES           8754
 
-// MDSTAT
-
-#define NETDATA_CHART_PRIO_MDSTAT_HEALTH              9000
-#define NETDATA_CHART_PRIO_MDSTAT_NONREDUNDANT        9001
-#define NETDATA_CHART_PRIO_MDSTAT_DISKS               9002 // 5 charts per raid
-#define NETDATA_CHART_PRIO_MDSTAT_MISMATCH            9003
-#define NETDATA_CHART_PRIO_MDSTAT_OPERATION           9004
-#define NETDATA_CHART_PRIO_MDSTAT_FINISH              9005
-#define NETDATA_CHART_PRIO_MDSTAT_SPEED               9006
-
 // Linux Power Supply
 
 #define NETDATA_CHART_PRIO_POWER_SUPPLY_CAPACITY      9500 // 4 charts per power supply

+ 5 - 0
web/gui/dashboard_info.js

@@ -127,6 +127,11 @@ netdataDashboard.menu = {
         info: 'Charts with performance information for all the system disks. Special care has been given to present disk performance metrics in a way compatible with <code>iostat -x</code>. netdata by default prevents rendering performance charts for individual partitions and unmounted virtual disks. Disabled charts can still be enabled by configuring the relative settings in the netdata configuration file.'
     },
 
+    'mdstat': {
+        title: 'MD arrays',
+        icon: '<i class="fas fa-hdd"></i>'
+    },
+
     'sensors': {
         title: 'Sensors',
         icon: '<i class="fas fa-leaf"></i>',