remove "ignore 0 metrics" leftovers (#17817)
Ilya Mashchenko committed
Jun 4, 2024 at 20:15 UTC
f73c87b81d1b3d7c32c3c926745737902e4c0ca0
9 files changed
+20
-39
src/collectors/freebsd.plugin/freebsd_kstat_zfs.c
+2
-6
@@ -12,10 +12,6 @@ unsigned long long zfs_arcstats_shrinkable_cache_size_bytes = 0;
12
int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
13
(void)dt;
14
15
- static int show_zero_charts = -1;
16
- if(unlikely(show_zero_charts == -1))
17
- show_zero_charts = config_get_boolean_ondemand("plugin:freebsd:zfs_arcstats", "show zero charts", CONFIG_BOOLEAN_NO);
18
-
15
unsigned long long l2_size;
16
size_t uint64_t_size = sizeof(uint64_t);
17
static struct mibs {
@@ -220,8 +216,8 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
216
zfs_arcstats_shrinkable_cache_size_bytes = 0;
217
}
218
223
- generate_charts_arcstats("freebsd.plugin", "zfs", show_zero_charts, update_every);
224
- generate_charts_arc_summary("freebsd.plugin", "zfs", show_zero_charts, update_every);
219
+ generate_charts_arcstats("freebsd.plugin", "zfs", update_every);
220
+ generate_charts_arc_summary("freebsd.plugin", "zfs", update_every);
221
222
return 0;
223
}
src/collectors/proc.plugin/proc_pagetypeinfo.c
+2
-3
@@ -227,9 +227,8 @@ int do_proc_pagetypeinfo(int update_every, usec_t dt) {
227
pgl = &pagelines[p];
228
229
// Skip invalid, refused or empty pagelines if not explicitly requested
230
- if (!pgl
231
- || do_detail == CONFIG_BOOLEAN_NO
232
- || (do_detail == CONFIG_BOOLEAN_AUTO && pageline_total_count(pgl) == 0 && netdata_zero_metrics_enabled != CONFIG_BOOLEAN_YES))
230
+ if (!pgl || do_detail == CONFIG_BOOLEAN_NO ||
231
+ (do_detail == CONFIG_BOOLEAN_AUTO && pageline_total_count(pgl) == 0))
232
continue;
233
234
// "pagetype Node" + NUMA-NodeId + ZoneName + TypeName
src/collectors/proc.plugin/proc_spl_kstat_zfs.c
+3
-9
@@ -16,7 +16,7 @@ unsigned long long zfs_arcstats_shrinkable_cache_size_bytes = 0;
16
int do_proc_spl_kstat_zfs_arcstats(int update_every, usec_t dt) {
17
(void)dt;
18
19
- static int show_zero_charts = 0, do_zfs_stats = 0;
19
+ static int do_zfs_stats = 0;
20
static procfile *ff = NULL;
21
static char *dirname = NULL;
22
static ARL_BASE *arl_base = NULL;
@@ -128,12 +128,6 @@ int do_proc_spl_kstat_zfs_arcstats(int update_every, usec_t dt) {
128
129
snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/spl/kstat/zfs");
130
dirname = config_get("plugin:proc:" ZFS_PROC_ARCSTATS, "directory to monitor", filename);
131
-
132
- show_zero_charts = config_get_boolean_ondemand("plugin:proc:" ZFS_PROC_ARCSTATS, "show zero charts", CONFIG_BOOLEAN_NO);
133
- if(show_zero_charts == CONFIG_BOOLEAN_AUTO && netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)
134
- show_zero_charts = CONFIG_BOOLEAN_YES;
135
- if(unlikely(show_zero_charts == CONFIG_BOOLEAN_YES))
136
- do_zfs_stats = 1;
131
}
132
133
// check if any pools exist
@@ -201,8 +195,8 @@ int do_proc_spl_kstat_zfs_arcstats(int update_every, usec_t dt) {
195
if(unlikely(arcstats.l2exist == -1))
196
arcstats.l2exist = 0;
197
204
- generate_charts_arcstats(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, show_zero_charts, update_every);
205
- generate_charts_arc_summary(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, show_zero_charts, update_every);
198
+ generate_charts_arcstats(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, update_every);
199
+ generate_charts_arc_summary(PLUGIN_PROC_NAME, ZFS_PROC_ARCSTATS, update_every);
200
201
return 0;
202
}
src/collectors/proc.plugin/proc_vmstat.c
+2
-5
@@ -177,9 +177,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
177
else
178
do_oom_kill = CONFIG_BOOLEAN_NO;
179
180
- if(do_numa == CONFIG_BOOLEAN_YES || (do_numa == CONFIG_BOOLEAN_AUTO &&
181
- (get_numa_node_count() >= 2 ||
182
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
180
+ if (do_numa == CONFIG_BOOLEAN_YES || (do_numa == CONFIG_BOOLEAN_AUTO && get_numa_node_count() >= 2)) {
181
arl_expect(arl_base, "numa_foreign", &numa_foreign);
182
arl_expect(arl_base, "numa_hint_faults_local", &numa_hint_faults_local);
183
arl_expect(arl_base, "numa_hint_faults", &numa_hint_faults);
@@ -189,8 +187,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
187
arl_expect(arl_base, "numa_other", &numa_other);
188
arl_expect(arl_base, "numa_pages_migrated", &numa_pages_migrated);
189
arl_expect(arl_base, "numa_pte_updates", &numa_pte_updates);
192
- }
193
- else {
190
+ } else {
191
// Do not expect numa metrics when they are not needed.
192
// By not adding them, the ARL will stop processing the file
193
// when all the expected metrics are collected.
src/collectors/proc.plugin/sys_devices_system_node.c
+1
-2
@@ -83,8 +83,7 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
83
hash_numa_miss = simple_hash("numa_miss");
84
}
85
86
- if(do_numastat == CONFIG_BOOLEAN_YES || (do_numastat == CONFIG_BOOLEAN_AUTO &&
87
- (numa_node_count >= 2 || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
86
+ if (do_numastat == CONFIG_BOOLEAN_YES || (do_numastat == CONFIG_BOOLEAN_AUTO && numa_node_count >= 2)) {
87
for(m = numa_root; m; m = m->next) {
88
if(m->numastat_filename) {
89
src/collectors/proc.plugin/zfs_common.c
+8
-8
@@ -4,13 +4,13 @@
4
5
struct arcstats arcstats = { 0 };
6
7
-void generate_charts_arcstats(const char *plugin, const char *module, int show_zero_charts, int update_every) {
7
+void generate_charts_arcstats(const char *plugin, const char *module, 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;
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 = do_l2hits =
13
+ do_list_hits = 1;
14
15
// ARC reads
16
unsigned long long aread = arcstats.hits + arcstats.misses;
@@ -545,13 +545,13 @@ void generate_charts_arcstats(const char *plugin, const char *module, int show_z
545
}
546
}
547
548
-void generate_charts_arc_summary(const char *plugin, const char *module, int show_zero_charts, int update_every) {
548
+void generate_charts_arc_summary(const char *plugin, const char *module, int update_every) {
549
static int do_arc_size_breakdown = -1, do_memory = -1, do_important_ops = -1, do_actual_hits = -1, \
550
do_demand_data_hits = -1, do_prefetch_data_hits = -1, do_hash_elements = -1, do_hash_chains = -1;
551
552
- if(unlikely(do_arc_size_breakdown == -1))
553
- do_arc_size_breakdown = do_memory = do_important_ops = do_actual_hits = do_demand_data_hits \
554
- = do_prefetch_data_hits = do_hash_elements = do_hash_chains = show_zero_charts;
552
+ if (unlikely(do_arc_size_breakdown == -1))
553
+ do_arc_size_breakdown = do_memory = do_important_ops = do_actual_hits = do_demand_data_hits =
554
+ do_prefetch_data_hits = do_hash_elements = do_hash_chains = 1;
555
556
unsigned long long arc_accesses_total = arcstats.hits + arcstats.misses;
557
unsigned long long real_hits = arcstats.mfu_hits + arcstats.mru_hits;
src/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 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);
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);
114
115
#endif //NETDATA_ZFS_COMMON_H
src/daemon/common.h
-1
@@ -111,7 +111,6 @@ extern char *netdata_configured_host_prefix;
111
extern char *netdata_configured_timezone;
112
extern char *netdata_configured_abbrev_timezone;
113
extern int32_t netdata_configured_utc_offset;
114
-extern int netdata_zero_metrics_enabled;
114
extern int netdata_anonymous_statistics_enabled;
115
116
extern bool netdata_ready;
src/daemon/main.c
-3
@@ -16,7 +16,6 @@
16
#endif
17
18
bool unittest_running = false;
19
-int netdata_zero_metrics_enabled;
19
int netdata_anonymous_statistics_enabled;
20
21
int libuv_worker_threads = MIN_LIBUV_WORKER_THREADS;
@@ -2241,8 +2240,6 @@ int main(int argc, char **argv) {
2240
2241
web_server_config_options();
2242
2244
- netdata_zero_metrics_enabled = config_get_boolean_ondemand(CONFIG_SECTION_DB, "enable zero metrics", CONFIG_BOOLEAN_NO);
2245
-
2243
set_late_global_environment(system_info);
2244
for (i = 0; static_threads[i].name != NULL ; i++) {
2245
struct netdata_static_thread *st = &static_threads[i];