fix(windows/netframework): dont sanitize proc name for labels (#19036)
Ilya Mashchenko committed
Nov 19, 2024 at 11:23 UTC
26e7f36df3b7d406f358e0c5483d90f18827696b
2 files changed
+39
-72
src/collectors/windows.plugin/perflib-netframework.c
+38
-71
@@ -142,12 +142,12 @@ static void netdata_framework_clr_exceptions(PERF_DATA_BLOCK *pDataBlock, PERF_O
142
if (strcasecmp(windows_shared_buffer, "_Global_") == 0)
143
continue;
144
145
- netdata_fix_chart_name(windows_shared_buffer);
145
struct net_framework_instances *p = dictionary_set(processes, windows_shared_buffer, NULL, sizeof(*p));
146
147
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRExceptionThrown)) {
148
if (!p->st_clrexception_thrown) {
149
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrexception_thrown", windows_shared_buffer);
150
+ netdata_fix_chart_name(id);
151
p->st_clrexception_thrown = rrdset_create_localhost(
152
"netframework",
153
id,
@@ -162,9 +162,8 @@ static void netdata_framework_clr_exceptions(PERF_DATA_BLOCK *pDataBlock, PERF_O
162
update_every,
163
RRDSET_TYPE_LINE);
164
165
- snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrexception_thrown_total", windows_shared_buffer);
165
p->rd_clrexception_thrown =
167
- rrddim_add(p->st_clrexception_thrown, id, "exceptions", 1, 1, RRD_ALGORITHM_INCREMENTAL);
166
+ rrddim_add(p->st_clrexception_thrown, "exceptions", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
167
168
rrdlabels_add(
169
p->st_clrexception_thrown->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -180,6 +179,7 @@ static void netdata_framework_clr_exceptions(PERF_DATA_BLOCK *pDataBlock, PERF_O
179
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRExceptionFilters)) {
180
if (!p->st_clrexception_filters) {
181
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrexception_filters", windows_shared_buffer);
182
+ netdata_fix_chart_name(id);
183
p->st_clrexception_filters = rrdset_create_localhost(
184
"netframework",
185
id,
@@ -194,9 +194,8 @@ static void netdata_framework_clr_exceptions(PERF_DATA_BLOCK *pDataBlock, PERF_O
194
update_every,
195
RRDSET_TYPE_LINE);
196
197
- snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrexception_filters_total", windows_shared_buffer);
197
p->rd_clrexception_filters =
199
- rrddim_add(p->st_clrexception_filters, id, "filters", 1, 1, RRD_ALGORITHM_INCREMENTAL);
198
+ rrddim_add(p->st_clrexception_filters, "filters", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
199
200
rrdlabels_add(
201
p->st_clrexception_filters->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -212,6 +211,7 @@ static void netdata_framework_clr_exceptions(PERF_DATA_BLOCK *pDataBlock, PERF_O
211
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRExceptionFinallys)) {
212
if (!p->st_clrexception_finallys) {
213
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrexception_finallys", windows_shared_buffer);
214
+ netdata_fix_chart_name(id);
215
p->st_clrexception_finallys = rrdset_create_localhost(
216
"netframework",
217
id,
@@ -226,9 +226,8 @@ static void netdata_framework_clr_exceptions(PERF_DATA_BLOCK *pDataBlock, PERF_O
226
update_every,
227
RRDSET_TYPE_LINE);
228
229
- snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrexception_finallys_total", windows_shared_buffer);
229
p->rd_clrexception_finallys =
231
- rrddim_add(p->st_clrexception_finallys, id, "finallys", 1, 1, RRD_ALGORITHM_INCREMENTAL);
230
+ rrddim_add(p->st_clrexception_finallys, "finallys", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
231
232
rrdlabels_add(
233
p->st_clrexception_finallys->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -244,6 +243,7 @@ static void netdata_framework_clr_exceptions(PERF_DATA_BLOCK *pDataBlock, PERF_O
243
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRExceptionTotalCatchDepth)) {
244
if (!p->st_clrexception_total_catch_depth) {
245
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrexception_throw_to_catch_depth", windows_shared_buffer);
246
+ netdata_fix_chart_name(id);
247
p->st_clrexception_total_catch_depth = rrdset_create_localhost(
248
"netframework",
249
id,
@@ -258,13 +258,8 @@ static void netdata_framework_clr_exceptions(PERF_DATA_BLOCK *pDataBlock, PERF_O
258
update_every,
259
RRDSET_TYPE_LINE);
260
261
- snprintfz(
262
- id,
263
- RRD_ID_LENGTH_MAX,
264
- "netframework_%s_clrexception_throw_to_catch_depth_total",
265
- windows_shared_buffer);
266
- p->rd_clrexception_total_catch_depth =
267
- rrddim_add(p->st_clrexception_total_catch_depth, id, "traversed", 1, 1, RRD_ALGORITHM_INCREMENTAL);
261
+ p->rd_clrexception_total_catch_depth = rrddim_add(
262
+ p->st_clrexception_total_catch_depth, "traversed", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
263
264
rrdlabels_add(
265
p->st_clrexception_total_catch_depth->rrdlabels,
@@ -296,12 +291,12 @@ static void netdata_framework_clr_interop(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
291
if (strcasecmp(windows_shared_buffer, "_Global_") == 0)
292
continue;
293
299
- netdata_fix_chart_name(windows_shared_buffer);
294
struct net_framework_instances *p = dictionary_set(processes, windows_shared_buffer, NULL, sizeof(*p));
295
296
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRInteropCOMCallableWrappers)) {
297
if (!p->st_clrinterop_com_callable_wrappers) {
298
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrinterop_com_callable_wrappers", windows_shared_buffer);
299
+ netdata_fix_chart_name(id);
300
p->st_clrinterop_com_callable_wrappers = rrdset_create_localhost(
301
"netframework",
302
id,
@@ -316,15 +311,10 @@ static void netdata_framework_clr_interop(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
311
update_every,
312
RRDSET_TYPE_LINE);
313
319
- snprintfz(
320
- id,
321
- RRD_ID_LENGTH_MAX,
322
- "netframework_%s_clrinterop_com_callable_wrappers_total",
323
- windows_shared_buffer);
314
p->rd_clrinterop_com_callable_wrappers = rrddim_add(
315
p->st_clrinterop_com_callable_wrappers,
326
- id,
316
"com_callable_wrappers",
317
+ NULL,
318
1,
319
1,
320
RRD_ALGORITHM_INCREMENTAL);
@@ -346,6 +336,7 @@ static void netdata_framework_clr_interop(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
336
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRInteropMarshalling)) {
337
if (!p->st_clrinterop_marshalling) {
338
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrinterop_interop_marshalling", windows_shared_buffer);
339
+ netdata_fix_chart_name(id);
340
p->st_clrinterop_marshalling = rrdset_create_localhost(
341
"netframework",
342
id,
@@ -360,13 +351,8 @@ static void netdata_framework_clr_interop(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
351
update_every,
352
RRDSET_TYPE_LINE);
353
363
- snprintfz(
364
- id,
365
- RRD_ID_LENGTH_MAX,
366
- "netframework_%s_clrinterop_interop_marshalling_total",
367
- windows_shared_buffer);
354
p->rd_clrinterop_marshalling =
369
- rrddim_add(p->st_clrinterop_marshalling, id, "marshallings", 1, 1, RRD_ALGORITHM_INCREMENTAL);
355
+ rrddim_add(p->st_clrinterop_marshalling, "marshallings", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
356
357
rrdlabels_add(
358
p->st_clrinterop_marshalling->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -382,6 +368,7 @@ static void netdata_framework_clr_interop(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
368
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRInteropStubsCreated)) {
369
if (!p->st_clrinterop_interop_stubs_created) {
370
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrinterop_interop_stubs_created", windows_shared_buffer);
371
+ netdata_fix_chart_name(id);
372
p->st_clrinterop_interop_stubs_created = rrdset_create_localhost(
373
"netframework",
374
id,
@@ -396,13 +383,8 @@ static void netdata_framework_clr_interop(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
383
update_every,
384
RRDSET_TYPE_LINE);
385
399
- snprintfz(
400
- id,
401
- RRD_ID_LENGTH_MAX,
402
- "netframework_%s_clrinterop_interop_stubs_created_total",
403
- windows_shared_buffer);
404
- p->rd_clrinterop_interop_stubs_created =
405
- rrddim_add(p->st_clrinterop_interop_stubs_created, id, "created", 1, 1, RRD_ALGORITHM_INCREMENTAL);
386
+ p->rd_clrinterop_interop_stubs_created = rrddim_add(
387
+ p->st_clrinterop_interop_stubs_created, "created", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
388
389
rrdlabels_add(
390
p->st_clrinterop_interop_stubs_created->rrdlabels,
@@ -434,12 +416,12 @@ static void netdata_framework_clr_jit(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_T
416
if (strcasecmp(windows_shared_buffer, "_Global_") == 0)
417
continue;
418
437
- netdata_fix_chart_name(windows_shared_buffer);
419
struct net_framework_instances *p = dictionary_set(processes, windows_shared_buffer, NULL, sizeof(*p));
420
421
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRJITMethods)) {
422
if (!p->st_clrjit_methods) {
423
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrjit_methods", windows_shared_buffer);
424
+ netdata_fix_chart_name(id);
425
p->st_clrjit_methods = rrdset_create_localhost(
426
"netframework",
427
id,
@@ -454,9 +436,8 @@ static void netdata_framework_clr_jit(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_T
436
update_every,
437
RRDSET_TYPE_LINE);
438
457
- snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrjit_methods_total", windows_shared_buffer);
439
p->rd_clrjit_methods =
459
- rrddim_add(p->st_clrjit_methods, id, "jit-compiled", 1, 1, RRD_ALGORITHM_INCREMENTAL);
440
+ rrddim_add(p->st_clrjit_methods, "jit-compiled", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
441
442
rrdlabels_add(p->st_clrjit_methods->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
443
}
@@ -472,6 +453,7 @@ static void netdata_framework_clr_jit(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_T
453
perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRJITPercentTime)) {
454
if (!p->st_clrjit_time) {
455
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrjit_time", windows_shared_buffer);
456
+ netdata_fix_chart_name(id);
457
p->st_clrjit_time = rrdset_create_localhost(
458
"netframework",
459
id,
@@ -486,8 +468,7 @@ static void netdata_framework_clr_jit(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_T
468
update_every,
469
RRDSET_TYPE_LINE);
470
489
- snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrjit_time_percent", windows_shared_buffer);
490
- p->rd_clrjit_time = rrddim_add(p->st_clrjit_time, id, "time", 1, 100, RRD_ALGORITHM_ABSOLUTE);
471
+ p->rd_clrjit_time = rrddim_add(p->st_clrjit_time, "time", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
472
473
rrdlabels_add(p->st_clrjit_time->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
474
}
@@ -502,6 +483,7 @@ static void netdata_framework_clr_jit(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_T
483
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRJITStandardFailures)) {
484
if (!p->st_clrjit_standard_failures) {
485
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrjit_standard_failures", windows_shared_buffer);
486
+ netdata_fix_chart_name(id);
487
p->st_clrjit_standard_failures = rrdset_create_localhost(
488
"netframework",
489
id,
@@ -516,10 +498,8 @@ static void netdata_framework_clr_jit(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_T
498
update_every,
499
RRDSET_TYPE_LINE);
500
519
- snprintfz(
520
- id, RRD_ID_LENGTH_MAX, "netframework_%s_clrjit_standard_failures_total", windows_shared_buffer);
501
p->rd_clrjit_standard_failures =
522
- rrddim_add(p->st_clrjit_standard_failures, id, "failures", 1, 1, RRD_ALGORITHM_INCREMENTAL);
502
+ rrddim_add(p->st_clrjit_standard_failures, "failures", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
503
504
rrdlabels_add(
505
p->st_clrjit_standard_failures->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -535,6 +515,7 @@ static void netdata_framework_clr_jit(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_T
515
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRJITIlBytes)) {
516
if (!p->st_clrjit_il_bytes) {
517
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrjit_il_bytes", windows_shared_buffer);
518
+ netdata_fix_chart_name(id);
519
p->st_clrjit_il_bytes = rrdset_create_localhost(
520
"netframework",
521
id,
@@ -549,9 +530,8 @@ static void netdata_framework_clr_jit(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_T
530
update_every,
531
RRDSET_TYPE_LINE);
532
552
- snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrjit_il_bytes_total", windows_shared_buffer);
533
p->rd_clrjit_il_bytes =
554
- rrddim_add(p->st_clrjit_il_bytes, id, "compiled_msil", 1, 1, RRD_ALGORITHM_INCREMENTAL);
534
+ rrddim_add(p->st_clrjit_il_bytes, "compiled_msil", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
535
536
rrdlabels_add(p->st_clrjit_il_bytes->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
537
}
@@ -579,12 +559,12 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
559
if (strcasecmp(windows_shared_buffer, "_Global_") == 0)
560
continue;
561
582
- netdata_fix_chart_name(windows_shared_buffer);
562
struct net_framework_instances *p = dictionary_set(processes, windows_shared_buffer, NULL, sizeof(*p));
563
564
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRLoadingHeapSize)) {
565
if (!p->st_clrloading_heap_size) {
566
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrloading_loader_heap_size", windows_shared_buffer);
567
+ netdata_fix_chart_name(id);
568
p->st_clrloading_heap_size = rrdset_create_localhost(
569
"netframework",
570
id,
@@ -599,10 +579,8 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
579
update_every,
580
RRDSET_TYPE_LINE);
581
602
- snprintfz(
603
- id, RRD_ID_LENGTH_MAX, "netframework_%s_clrloading_loader_heap_size_bytes", windows_shared_buffer);
582
p->rd_clrloading_heap_size =
605
- rrddim_add(p->st_clrloading_heap_size, id, "committed", 1, 1, RRD_ALGORITHM_ABSOLUTE);
583
+ rrddim_add(p->st_clrloading_heap_size, "committed", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
584
585
rrdlabels_add(
586
p->st_clrloading_heap_size->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -618,6 +596,7 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
596
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRLoadingAppDomainsLoaded)) {
597
if (!p->st_clrloading_app_domains_loaded) {
598
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrloading_appdomains_loaded", windows_shared_buffer);
599
+ netdata_fix_chart_name(id);
600
p->st_clrloading_app_domains_loaded = rrdset_create_localhost(
601
"netframework",
602
id,
@@ -632,10 +611,8 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
611
update_every,
612
RRDSET_TYPE_LINE);
613
635
- snprintfz(
636
- id, RRD_ID_LENGTH_MAX, "netframework_%s_clrloading_appdomains_loaded_total", windows_shared_buffer);
614
p->rd_clrloading_app_domains_loaded =
638
- rrddim_add(p->st_clrloading_app_domains_loaded, id, "loaded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
615
+ rrddim_add(p->st_clrloading_app_domains_loaded, "loaded", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
616
617
rrdlabels_add(
618
p->st_clrloading_app_domains_loaded->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -651,6 +628,7 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
628
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRLoadingAppDomainsUnloaded)) {
629
if (!p->st_clrloading_app_domains_unloaded) {
630
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrloading_appdomains_unloaded", windows_shared_buffer);
631
+ netdata_fix_chart_name(id);
632
p->st_clrloading_app_domains_unloaded = rrdset_create_localhost(
633
"netframework",
634
id,
@@ -665,13 +643,8 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
643
update_every,
644
RRDSET_TYPE_LINE);
645
668
- snprintfz(
669
- id,
670
- RRD_ID_LENGTH_MAX,
671
- "netframework_%s_clrloading_appdomains_unloaded_total",
672
- windows_shared_buffer);
673
- p->rd_clrloading_app_domains_unloaded =
674
- rrddim_add(p->st_clrloading_app_domains_unloaded, id, "unloaded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
646
+ p->rd_clrloading_app_domains_unloaded = rrddim_add(
647
+ p->st_clrloading_app_domains_unloaded, "unloaded", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
648
649
rrdlabels_add(
650
p->st_clrloading_app_domains_unloaded->rrdlabels,
@@ -690,6 +663,7 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
663
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRLoadingAssembliesLoaded)) {
664
if (!p->st_clrloading_assemblies_loaded) {
665
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrloading_assemblies_loaded", windows_shared_buffer);
666
+ netdata_fix_chart_name(id);
667
p->st_clrloading_assemblies_loaded = rrdset_create_localhost(
668
"netframework",
669
id,
@@ -704,10 +678,8 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
678
update_every,
679
RRDSET_TYPE_LINE);
680
707
- snprintfz(
708
- id, RRD_ID_LENGTH_MAX, "netframework_%s_clrloading_assemblies_loaded_total", windows_shared_buffer);
681
p->rd_clrloading_assemblies_loaded =
710
- rrddim_add(p->st_clrloading_assemblies_loaded, id, "loaded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
682
+ rrddim_add(p->st_clrloading_assemblies_loaded, "loaded", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
683
684
rrdlabels_add(
685
p->st_clrloading_assemblies_loaded->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -723,6 +695,7 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
695
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRLoadingClassesLoaded)) {
696
if (!p->st_clrloading_classes_loaded) {
697
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrloading_classes_loaded", windows_shared_buffer);
698
+ netdata_fix_chart_name(id);
699
p->st_clrloading_classes_loaded = rrdset_create_localhost(
700
"netframework",
701
id,
@@ -737,10 +710,8 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
710
update_every,
711
RRDSET_TYPE_LINE);
712
740
- snprintfz(
741
- id, RRD_ID_LENGTH_MAX, "netframework_%s_clrloading_classes_loaded_total", windows_shared_buffer);
713
p->rd_clrloading_classes_loaded =
743
- rrddim_add(p->st_clrloading_classes_loaded, id, "loaded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
714
+ rrddim_add(p->st_clrloading_classes_loaded, "loaded", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
715
716
rrdlabels_add(
717
p->st_clrloading_classes_loaded->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -756,6 +727,7 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
727
if (perflibGetObjectCounter(pDataBlock, pObjectType, &p->NETFrameworkCLRLoadingClassLoadFailure)) {
728
if (!p->st_clrloading_class_load_failure) {
729
snprintfz(id, RRD_ID_LENGTH_MAX, "%s_clrloading_class_load_failure", windows_shared_buffer);
730
+ netdata_fix_chart_name(id);
731
p->st_clrloading_class_load_failure = rrdset_create_localhost(
732
"netframework",
733
id,
@@ -770,13 +742,8 @@ static void netdata_framework_clr_loading(PERF_DATA_BLOCK *pDataBlock, PERF_OBJE
742
update_every,
743
RRDSET_TYPE_LINE);
744
773
- snprintfz(
774
- id,
775
- RRD_ID_LENGTH_MAX,
776
- "netframework_%s_clrloading_class_load_failures_total",
777
- windows_shared_buffer);
778
- p->rd_clrloading_class_load_failure =
779
- rrddim_add(p->st_clrloading_class_load_failure, id, "class_load", 1, 1, RRD_ALGORITHM_INCREMENTAL);
745
+ p->rd_clrloading_class_load_failure = rrddim_add(
746
+ p->st_clrloading_class_load_failure, "class_load", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
747
748
rrdlabels_add(
749
p->st_clrloading_class_load_failure->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
src/collectors/windows.plugin/perflib-thermalzone.c
+1
-1
@@ -42,7 +42,6 @@ static bool do_thermal_zones(PERF_DATA_BLOCK *pDataBlock, int update_every) {
42
if (!getInstanceName(pDataBlock, pObjectType, pi, windows_shared_buffer, sizeof(windows_shared_buffer)))
43
strncpyz(windows_shared_buffer, "[unknown]", sizeof(windows_shared_buffer) - 1);
44
45
- netdata_fix_chart_name(windows_shared_buffer);
45
struct thermal_zone *p = dictionary_set(thermal_zones, windows_shared_buffer, NULL, sizeof(*p));
46
47
perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->thermalZoneTemperature);
@@ -51,6 +50,7 @@ static bool do_thermal_zones(PERF_DATA_BLOCK *pDataBlock, int update_every) {
50
if (!p->st) {
51
char id[RRD_ID_LENGTH_MAX + 1];
52
snprintfz(id, RRD_ID_LENGTH_MAX, "thermalzone_%s_temperature", windows_shared_buffer);
53
+ netdata_fix_chart_name(id);
54
p->st = rrdset_create_localhost(
55
"system",
56
id,