Don't show zero charts for ZFS filesystem (#5211)
* Check if any pools exist * Don't show zero charts
Vladimir Kobal committed
Jan 24, 2019 at 15:15 UTC
7da7fb985f4a6514522cf012511a74182d094be7
4 files changed
+129
-28
collectors/freebsd.plugin/freebsd_kstat_zfs.c
+8
-4
@@ -11,6 +11,10 @@ extern struct arcstats arcstats;
11
int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
12
(void)dt;
13
14
+ static int show_zero_charts = -1;
15
+ if(unlikely(show_zero_charts == -1))
16
+ show_zero_charts = config_get_boolean_ondemand("plugin:freebsd:zfs_arcstats", "show zero charts", CONFIG_BOOLEAN_NO);
17
+
18
unsigned long long l2_size;
19
size_t uint64_t_size = sizeof(uint64_t);
20
static struct mibs {
@@ -209,8 +213,8 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
213
// missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_need_free", mibs.arc_need_free, arcstats.arc_need_free);
214
// missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_sys_free", mibs.arc_sys_free, arcstats.arc_sys_free);
215
212
- generate_charts_arcstats("freebsd", "zfs", update_every);
213
- generate_charts_arc_summary("freebsd", "zfs", update_every);
216
+ generate_charts_arcstats("freebsd", "zfs", show_zero_charts, update_every);
217
+ generate_charts_arc_summary("freebsd", "zfs", show_zero_charts, update_every);
218
219
return 0;
220
}
@@ -261,7 +265,7 @@ int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
265
266
rrddim_set_by_pointer(st_bytes, rd_bytes, bytes);
267
rrdset_done(st_bytes);
264
-
268
+
269
// --------------------------------------------------------------------
270
271
static RRDSET *st_requests = NULL;
@@ -293,7 +297,7 @@ int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt) {
297
rrddim_set_by_pointer(st_requests, rd_failed, failed);
298
rrddim_set_by_pointer(st_requests, rd_unsupported, unsupported);
299
rrdset_done(st_requests);
296
-
300
+
301
}
302
303
return 0;
collectors/proc.plugin/proc_spl_kstat_zfs.c
+41
-2
@@ -10,7 +10,9 @@ extern struct arcstats arcstats;
10
int do_proc_spl_kstat_zfs_arcstats(int update_every, usec_t dt) {
11
(void)dt;
12
13
+ static int show_zero_charts = 0, do_zfs_stats = 0;
14
static procfile *ff = NULL;
15
+ static char *dirname = NULL;
16
static ARL_BASE *arl_base = NULL;
17
18
arcstats.l2exist = -1;
@@ -117,8 +119,45 @@ int do_proc_spl_kstat_zfs_arcstats(int update_every, usec_t dt) {
119
ff = procfile_open(config_get("plugin:proc:" ZFS_PROC_ARCSTATS, "filename to monitor", filename), " \t:", PROCFILE_FLAG_DEFAULT);
120
if(unlikely(!ff))
121
return 1;
122
+
123
+ snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/spl/kstat/zfs");
124
+ dirname = config_get("plugin:proc:" ZFS_PROC_ARCSTATS, "directory to monitor", filename);
125
+
126
+ show_zero_charts = config_get_boolean_ondemand("plugin:proc:" ZFS_PROC_ARCSTATS, "show zero charts", CONFIG_BOOLEAN_NO);
127
+ if(unlikely(show_zero_charts == CONFIG_BOOLEAN_YES))
128
+ do_zfs_stats = 1;
129
+ }
130
+
131
+ // check if any pools exist
132
+ if(likely(!do_zfs_stats)) {
133
+ DIR *dir = opendir(dirname);
134
+ if(unlikely(!dir)) {
135
+ error("Cannot read directory '%s'", dirname);
136
+ return 1;
137
+ }
138
+
139
+ struct dirent *de = NULL;
140
+ while(likely(de = readdir(dir))) {
141
+ if(likely(de->d_type == DT_DIR
142
+ && (
143
+ (de->d_name[0] == '.' && de->d_name[1] == '\0')
144
+ || (de->d_name[0] == '.' && de->d_name[1] == '.' && de->d_name[2] == '\0')
145
+ )))
146
+ continue;
147
+
148
+ if(unlikely(de->d_type == DT_LNK || de->d_type == DT_DIR)) {
149
+ do_zfs_stats = 1;
150
+ break;
151
+ }
152
+ }
153
+
154
+ closedir(dir);
155
}
156
157
+ // do not show ZFS filesystem metrics if there haven't been any pools in the system yet
158
+ if(unlikely(!do_zfs_stats))
159
+ return 0;
160
+
161
ff = procfile_readall(ff);
162
if(unlikely(!ff))
163
return 0; // we return 0, so that we will retry to open it next time
@@ -148,8 +187,8 @@ int do_proc_spl_kstat_zfs_arcstats(int update_every, usec_t dt) {
187
if(unlikely(arcstats.l2exist == -1))
188
arcstats.l2exist = 0;
189
151
- generate_charts_arcstats(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, update_every);
152
- generate_charts_arc_summary(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, update_every);
190
+ generate_charts_arcstats(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, show_zero_charts, update_every);
191
+ generate_charts_arc_summary(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, show_zero_charts, update_every);
192
193
return 0;
194
}
collectors/proc.plugin/zfs_common.c
+78
-20
@@ -4,7 +4,13 @@
4
5
struct arcstats arcstats = { 0 };
6
7
-void generate_charts_arcstats(const char *plugin, const char *module, int update_every) {
7
+void generate_charts_arcstats(const char *plugin, const char *module, int show_zero_charts, int update_every) {
8
+ static int do_arc_size = -1, do_l2_size = -1, do_reads = -1, do_l2bytes = -1, do_ahits = -1, do_dhits = -1, \
9
+ do_phits = -1, do_mhits = -1, do_l2hits = -1, do_list_hits = -1;
10
+
11
+ if(unlikely(do_arc_size == -1))
12
+ do_arc_size = do_l2_size = do_reads = do_l2bytes = do_ahits = do_dhits = do_phits = do_mhits \
13
+ = do_l2hits = do_list_hits = show_zero_charts;
14
15
// ARC reads
16
unsigned long long aread = arcstats.hits + arcstats.misses;
@@ -31,7 +37,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
37
38
// --------------------------------------------------------------------
39
34
- {
40
+ if(do_arc_size == CONFIG_BOOLEAN_YES || arcstats.size || arcstats.c || arcstats.c_min || arcstats.c_max) {
41
+ do_arc_size = CONFIG_BOOLEAN_YES;
42
+
43
static RRDSET *st_arc_size = NULL;
44
static RRDDIM *rd_arc_size = NULL;
45
static RRDDIM *rd_arc_target_size = NULL;
@@ -71,7 +79,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
79
80
// --------------------------------------------------------------------
81
74
- if(likely(arcstats.l2exist)) {
82
+ if(likely(arcstats.l2exist) && (do_l2_size == CONFIG_BOOLEAN_YES || arcstats.l2_size || arcstats.l2_asize)) {
83
+ do_l2_size = CONFIG_BOOLEAN_YES;
84
+
85
static RRDSET *st_l2_size = NULL;
86
static RRDDIM *rd_l2_size = NULL;
87
static RRDDIM *rd_l2_asize = NULL;
@@ -105,7 +115,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
115
116
// --------------------------------------------------------------------
117
108
- {
118
+ if(likely(do_reads == CONFIG_BOOLEAN_YES || aread || dread || pread || mread || l2read)) {
119
+ do_reads = CONFIG_BOOLEAN_YES;
120
+
121
static RRDSET *st_reads = NULL;
122
static RRDDIM *rd_aread = NULL;
123
static RRDDIM *rd_dread = NULL;
@@ -153,7 +165,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
165
166
// --------------------------------------------------------------------
167
156
- if(likely(arcstats.l2exist)) {
168
+ if(likely(arcstats.l2exist && (do_l2bytes == CONFIG_BOOLEAN_YES || arcstats.l2_read_bytes || arcstats.l2_write_bytes))) {
169
+ do_l2bytes = CONFIG_BOOLEAN_YES;
170
+
171
static RRDSET *st_l2bytes = NULL;
172
static RRDDIM *rd_l2_read_bytes = NULL;
173
static RRDDIM *rd_l2_write_bytes = NULL;
@@ -187,7 +201,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
201
202
// --------------------------------------------------------------------
203
190
- {
204
+ if(likely(do_ahits == CONFIG_BOOLEAN_YES || arcstats.hits || arcstats.misses)) {
205
+ do_ahits = CONFIG_BOOLEAN_YES;
206
+
207
static RRDSET *st_ahits = NULL;
208
static RRDDIM *rd_ahits = NULL;
209
static RRDDIM *rd_amisses = NULL;
@@ -221,7 +237,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
237
238
// --------------------------------------------------------------------
239
224
- {
240
+ if(likely(do_dhits == CONFIG_BOOLEAN_YES || dhit || dmiss)) {
241
+ do_dhits = CONFIG_BOOLEAN_YES;
242
+
243
static RRDSET *st_dhits = NULL;
244
static RRDDIM *rd_dhits = NULL;
245
static RRDDIM *rd_dmisses = NULL;
@@ -255,7 +273,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
273
274
// --------------------------------------------------------------------
275
258
- {
276
+ if(likely(do_phits == CONFIG_BOOLEAN_YES || phit || pmiss)) {
277
+ do_phits = CONFIG_BOOLEAN_YES;
278
+
279
static RRDSET *st_phits = NULL;
280
static RRDDIM *rd_phits = NULL;
281
static RRDDIM *rd_pmisses = NULL;
@@ -289,7 +309,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
309
310
// --------------------------------------------------------------------
311
292
- {
312
+ if(likely(do_mhits == CONFIG_BOOLEAN_YES || mhit || mmiss)) {
313
+ do_mhits = CONFIG_BOOLEAN_YES;
314
+
315
static RRDSET *st_mhits = NULL;
316
static RRDDIM *rd_mhits = NULL;
317
static RRDDIM *rd_mmisses = NULL;
@@ -323,7 +345,9 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
345
346
// --------------------------------------------------------------------
347
326
- if(likely(arcstats.l2exist)) {
348
+ if(likely(arcstats.l2exist && (do_l2hits == CONFIG_BOOLEAN_YES || l2hit || l2miss))) {
349
+ do_l2hits = CONFIG_BOOLEAN_YES;
350
+
351
static RRDSET *st_l2hits = NULL;
352
static RRDDIM *rd_l2hits = NULL;
353
static RRDDIM *rd_l2misses = NULL;
@@ -357,7 +381,12 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
381
382
// --------------------------------------------------------------------
383
360
- {
384
+ if(likely(do_list_hits == CONFIG_BOOLEAN_YES || arcstats.mfu_hits \
385
+ || arcstats.mru_hits \
386
+ || arcstats.mfu_ghost_hits \
387
+ || arcstats.mru_ghost_hits)) {
388
+ do_list_hits = CONFIG_BOOLEAN_YES;
389
+
390
static RRDSET *st_list_hits = NULL;
391
static RRDDIM *rd_mfu = NULL;
392
static RRDDIM *rd_mru = NULL;
@@ -396,7 +425,14 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
425
}
426
}
427
399
-void generate_charts_arc_summary(const char *plugin, const char *module, int update_every) {
428
+void generate_charts_arc_summary(const char *plugin, const char *module, int show_zero_charts, int update_every) {
429
+ static int do_arc_size_breakdown = -1, do_memory = -1, do_important_ops = -1, do_actual_hits = -1, \
430
+ do_demand_data_hits = -1, do_prefetch_data_hits = -1, do_hash_elements = -1, do_hash_chains = -1;
431
+
432
+ if(unlikely(do_arc_size_breakdown == -1))
433
+ do_arc_size_breakdown = do_memory = do_important_ops = do_actual_hits = do_demand_data_hits \
434
+ = do_prefetch_data_hits = do_hash_elements = do_hash_chains = show_zero_charts;
435
+
436
unsigned long long arc_accesses_total = arcstats.hits + arcstats.misses;
437
unsigned long long real_hits = arcstats.mfu_hits + arcstats.mru_hits;
438
unsigned long long real_misses = arc_accesses_total - real_hits;
@@ -418,7 +454,9 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int upd
454
455
// --------------------------------------------------------------------
456
421
- {
457
+ if(likely(do_arc_size_breakdown == CONFIG_BOOLEAN_YES || mru_size || mfu_size)) {
458
+ do_arc_size_breakdown = CONFIG_BOOLEAN_YES;
459
+
460
static RRDSET *st_arc_size_breakdown = NULL;
461
static RRDDIM *rd_most_recent = NULL;
462
static RRDDIM *rd_most_frequent = NULL;
@@ -452,7 +490,11 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int upd
490
491
// --------------------------------------------------------------------
492
455
- {
493
+ if(likely(do_memory == CONFIG_BOOLEAN_YES || arcstats.memory_direct_count \
494
+ || arcstats.memory_throttle_count \
495
+ || arcstats.memory_indirect_count)) {
496
+ do_memory = CONFIG_BOOLEAN_YES;
497
+
498
static RRDSET *st_memory = NULL;
499
#ifndef __FreeBSD__
500
static RRDDIM *rd_direct = NULL;
@@ -501,7 +543,12 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int upd
543
544
// --------------------------------------------------------------------
545
504
- {
546
+ if(likely(do_important_ops == CONFIG_BOOLEAN_YES || arcstats.deleted \
547
+ || arcstats.evict_skip \
548
+ || arcstats.mutex_miss \
549
+ || arcstats.hash_collisions)) {
550
+ do_important_ops = CONFIG_BOOLEAN_YES;
551
+
552
static RRDSET *st_important_ops = NULL;
553
static RRDDIM *rd_deleted = NULL;
554
static RRDDIM *rd_mutex_misses = NULL;
@@ -541,7 +588,9 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int upd
588
589
// --------------------------------------------------------------------
590
544
- {
591
+ if(likely(do_actual_hits == CONFIG_BOOLEAN_YES || real_hits || real_misses)) {
592
+ do_actual_hits = CONFIG_BOOLEAN_YES;
593
+
594
static RRDSET *st_actual_hits = NULL;
595
static RRDDIM *rd_actual_hits = NULL;
596
static RRDDIM *rd_actual_misses = NULL;
@@ -575,7 +624,9 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int upd
624
625
// --------------------------------------------------------------------
626
578
- {
627
+ if(likely(do_demand_data_hits == CONFIG_BOOLEAN_YES || arcstats.demand_data_hits || arcstats.demand_data_misses)) {
628
+ do_demand_data_hits = CONFIG_BOOLEAN_YES;
629
+
630
static RRDSET *st_demand_data_hits = NULL;
631
static RRDDIM *rd_demand_data_hits = NULL;
632
static RRDDIM *rd_demand_data_misses = NULL;
@@ -609,7 +660,10 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int upd
660
661
// --------------------------------------------------------------------
662
612
- {
663
+ if(likely(do_prefetch_data_hits == CONFIG_BOOLEAN_YES || arcstats.prefetch_data_hits \
664
+ || arcstats.prefetch_data_misses)) {
665
+ do_prefetch_data_hits = CONFIG_BOOLEAN_YES;
666
+
667
static RRDSET *st_prefetch_data_hits = NULL;
668
static RRDDIM *rd_prefetch_data_hits = NULL;
669
static RRDDIM *rd_prefetch_data_misses = NULL;
@@ -643,7 +697,9 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int upd
697
698
// --------------------------------------------------------------------
699
646
- {
700
+ if(likely(do_hash_elements == CONFIG_BOOLEAN_YES || arcstats.hash_elements || arcstats.hash_elements_max)) {
701
+ do_hash_elements = CONFIG_BOOLEAN_YES;
702
+
703
static RRDSET *st_hash_elements = NULL;
704
static RRDDIM *rd_hash_elements_current = NULL;
705
static RRDDIM *rd_hash_elements_max = NULL;
@@ -677,7 +733,9 @@ void generate_charts_arc_summary(const char *plugin, const char *module, int upd
733
734
// --------------------------------------------------------------------
735
680
- {
736
+ if(likely(do_hash_chains == CONFIG_BOOLEAN_YES || arcstats.hash_chains || arcstats.hash_chain_max)) {
737
+ do_hash_chains = CONFIG_BOOLEAN_YES;
738
+
739
static RRDSET *st_hash_chains = NULL;
740
static RRDDIM *rd_hash_chains_current = NULL;
741
static RRDDIM *rd_hash_chains_max = NULL;
collectors/proc.plugin/zfs_common.h
+2
-2
@@ -109,7 +109,7 @@ struct arcstats {
109
int l2exist;
110
};
111
112
-void generate_charts_arcstats(const char *plugin, const char *module, int update_every);
113
-void generate_charts_arc_summary(const char *plugin, const char *module, int update_every);
112
+void generate_charts_arcstats(const char *plugin, const char *module, int show_zero_charts, int update_every);
113
+void generate_charts_arc_summary(const char *plugin, const char *module, int show_zero_charts, int update_every);
114
115
#endif //NETDATA_ZFS_COMMON_H