fix(windows/iis): dont sanitize site name for labels (#19027)
Ilya Mashchenko committed
Nov 15, 2024 at 16:54 UTC
13624adf9e8f7d02e61a0c83542323ca1021d2b5
1 file changed
+25
-46
src/collectors/windows.plugin/perflib-web-service.c
+25
-46
@@ -144,13 +144,13 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
144
continue;
145
}
146
147
- netdata_fix_chart_name(windows_shared_buffer);
147
struct web_service *p = dictionary_set(web_services, windows_shared_buffer, NULL, sizeof(*p));
148
149
if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISReceivedBytesTotal) &&
150
perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISSentBytesTotal)) {
151
if (!p->st_traffic) {
152
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_traffic", windows_shared_buffer);
153
+ netdata_fix_chart_name(id);
154
p->st_traffic = rrdset_create_localhost(
155
"iis",
156
id,
@@ -165,18 +165,13 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
165
update_every,
166
RRDSET_TYPE_AREA);
167
168
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_received_bytes_total", windows_shared_buffer);
169
- p->rd_traffic_received = rrddim_add(p->st_traffic, id, "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
170
-
171
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_sent_bytes_total", windows_shared_buffer);
172
- p->rd_traffic_sent = rrddim_add(p->st_traffic, id, "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
173
-
168
+ p->rd_traffic_received = rrddim_add(p->st_traffic, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
169
+ p->rd_traffic_sent = rrddim_add(p->st_traffic, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
170
rrdlabels_add(p->st_traffic->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
171
}
172
173
rrddim_set_by_pointer(
174
p->st_traffic, p->rd_traffic_received, (collected_number)p->IISReceivedBytesTotal.current.Data);
179
-
175
rrddim_set_by_pointer(
176
p->st_traffic, p->rd_traffic_sent, (collected_number)p->IISSentBytesTotal.current.Data);
177
@@ -187,6 +182,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
182
perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISFilesSentTotal)) {
183
if (!p->st_file_transfer) {
184
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_ftp_file_transfer_rate", windows_shared_buffer);
185
+ netdata_fix_chart_name(id);
186
p->st_file_transfer = rrdset_create_localhost(
187
"iis",
188
id,
@@ -201,18 +197,13 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
197
update_every,
198
RRDSET_TYPE_LINE);
199
204
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_files_received_total", windows_shared_buffer);
205
- p->rd_files_received = rrddim_add(p->st_file_transfer, id, "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
206
-
207
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_files_sent_total", windows_shared_buffer);
208
- p->rd_files_sent = rrddim_add(p->st_file_transfer, id, "sent", 1, 1, RRD_ALGORITHM_INCREMENTAL);
209
-
200
+ p->rd_files_received = rrddim_add(p->st_file_transfer, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
201
+ p->rd_files_sent = rrddim_add(p->st_file_transfer, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
202
rrdlabels_add(p->st_file_transfer->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
203
}
204
205
rrddim_set_by_pointer(
206
p->st_file_transfer, p->rd_files_received, (collected_number)p->IISFilesReceivedTotal.current.Data);
215
-
207
rrddim_set_by_pointer(
208
p->st_file_transfer, p->rd_files_sent, (collected_number)p->IISFilesSentTotal.current.Data);
209
@@ -222,6 +213,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
213
if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISCurrentConnections)) {
214
if (!p->st_curr_connections) {
215
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_active_connections_count", windows_shared_buffer);
216
+ netdata_fix_chart_name(id);
217
p->st_curr_connections = rrdset_create_localhost(
218
"iis",
219
id,
@@ -236,9 +228,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
228
update_every,
229
RRDSET_TYPE_LINE);
230
239
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_current_connections", windows_shared_buffer);
240
- p->rd_curr_connections = rrddim_add(p->st_curr_connections, id, "active", 1, 1, RRD_ALGORITHM_ABSOLUTE);
241
-
231
+ p->rd_curr_connections = rrddim_add(p->st_curr_connections, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
232
rrdlabels_add(p->st_curr_connections->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
233
}
234
@@ -268,13 +258,8 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
258
update_every,
259
RRDSET_TYPE_LINE);
260
271
- snprintfz(
272
- id,
273
- RRD_ID_LENGTH_MAX,
274
- "iis_website_%s_connection_attempts_all_instances_total",
275
- windows_shared_buffer);
261
p->rd_connections_attemps =
277
- rrddim_add(p->st_connections_attemps, id, "connection", 1, 1, RRD_ALGORITHM_INCREMENTAL);
262
+ rrddim_add(p->st_connections_attemps, "connection", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
263
264
rrdlabels_add(
265
p->st_connections_attemps->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -292,6 +277,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
277
perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISCurrentNonAnonymousUsers)) {
278
if (!p->st_user_count) {
279
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_users_count", windows_shared_buffer);
280
+ netdata_fix_chart_name(id);
281
p->st_user_count = rrdset_create_localhost(
282
"iis",
283
id,
@@ -306,12 +292,9 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
292
update_every,
293
RRDSET_TYPE_STACKED);
294
309
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_current_anonymous_users", windows_shared_buffer);
310
- p->rd_user_anonymous = rrddim_add(p->st_user_count, id, "anonymous", 1, 1, RRD_ALGORITHM_INCREMENTAL);
311
-
312
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_current_non_anonymous_users", windows_shared_buffer);
295
+ p->rd_user_anonymous = rrddim_add(p->st_user_count, "anonymous", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
296
p->rd_user_nonanonymous =
314
- rrddim_add(p->st_user_count, id, "non_anonymous", 1, 1, RRD_ALGORITHM_INCREMENTAL);
297
+ rrddim_add(p->st_user_count, "non_anonymous", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
298
299
rrdlabels_add(p->st_user_count->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
300
}
@@ -330,6 +313,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
313
if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISCurrentISAPIExtRequests)) {
314
if (!p->st_isapi_extension_request_count) {
315
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_isapi_extension_requests_count", windows_shared_buffer);
316
+ netdata_fix_chart_name(id);
317
p->st_isapi_extension_request_count = rrdset_create_localhost(
318
"iis",
319
id,
@@ -344,10 +328,8 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
328
update_every,
329
RRDSET_TYPE_LINE);
330
347
- snprintfz(
348
- id, RRD_ID_LENGTH_MAX, "iis_website_%s_current_isapi_extension_requests", windows_shared_buffer);
331
p->rd_isapi_extension_request_count =
350
- rrddim_add(p->st_isapi_extension_request_count, id, "isapi", 1, 1, RRD_ALGORITHM_ABSOLUTE);
332
+ rrddim_add(p->st_isapi_extension_request_count, "isapi", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
333
334
rrdlabels_add(
335
p->st_isapi_extension_request_count->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -364,6 +346,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
346
if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISIPAPIExtRequestsTotal)) {
347
if (!p->st_isapi_extension_request_rate) {
348
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_isapi_extension_requests_rate", windows_shared_buffer);
349
+ netdata_fix_chart_name(id);
350
p->st_isapi_extension_request_rate = rrdset_create_localhost(
351
"iis",
352
id,
@@ -378,10 +361,8 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
361
update_every,
362
RRDSET_TYPE_LINE);
363
381
- snprintfz(
382
- id, RRD_ID_LENGTH_MAX, "iis_website_%s_isapi_extension_requests_total", windows_shared_buffer);
364
p->rd_isapi_extension_request_rate =
384
- rrddim_add(p->st_isapi_extension_request_rate, id, "isapi", 1, 1, RRD_ALGORITHM_INCREMENTAL);
365
+ rrddim_add(p->st_isapi_extension_request_rate, "isapi", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
366
367
rrdlabels_add(
368
p->st_isapi_extension_request_rate->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -399,6 +380,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
380
perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISNotFoundErrorsTotal)) {
381
if (!p->st_error_rate) {
382
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_errors_rate", windows_shared_buffer);
383
+ netdata_fix_chart_name(id);
384
p->st_error_rate = rrdset_create_localhost(
385
"iis",
386
id,
@@ -413,13 +395,10 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
395
update_every,
396
RRDSET_TYPE_STACKED);
397
416
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_locked_errors_total", windows_shared_buffer);
398
p->rd_error_rate_locked =
418
- rrddim_add(p->st_error_rate, id, "document_locked", 1, 1, RRD_ALGORITHM_INCREMENTAL);
419
-
420
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_not_found_errors_total", windows_shared_buffer);
399
+ rrddim_add(p->st_error_rate, "document_locked", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
400
p->rd_error_rate_not_found =
422
- rrddim_add(p->st_error_rate, id, "document_not_found", 1, 1, RRD_ALGORITHM_INCREMENTAL);
401
+ rrddim_add(p->st_error_rate, "document_not_found", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
402
403
rrdlabels_add(p->st_error_rate->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
404
}
@@ -436,6 +415,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
415
if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISLogonAttemptsTotal)) {
416
if (!p->st_logon_attemps) {
417
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_logon_attempts_rate", windows_shared_buffer);
418
+ netdata_fix_chart_name(id);
419
p->st_logon_attemps = rrdset_create_localhost(
420
"iis",
421
id,
@@ -450,8 +430,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
430
update_every,
431
RRDSET_TYPE_LINE);
432
453
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_logon_attempts_total", windows_shared_buffer);
454
- p->rd_logon_attemps = rrddim_add(p->st_logon_attemps, id, "logon", 1, 1, RRD_ALGORITHM_INCREMENTAL);
433
+ p->rd_logon_attemps = rrddim_add(p->st_logon_attemps, "logon", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
434
435
rrdlabels_add(p->st_logon_attemps->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
436
}
@@ -465,6 +444,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
444
if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISUptime)) {
445
if (!p->st_service_uptime) {
446
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_uptime", windows_shared_buffer);
447
+ netdata_fix_chart_name(id);
448
p->st_service_uptime = rrdset_create_localhost(
449
"iis",
450
id,
@@ -479,8 +459,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
459
update_every,
460
RRDSET_TYPE_LINE);
461
482
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_service_uptime", windows_shared_buffer);
483
- p->rd_service_uptime = rrddim_add(p->st_service_uptime, id, "uptime", 1, 1, RRD_ALGORITHM_ABSOLUTE);
462
+ p->rd_service_uptime = rrddim_add(p->st_service_uptime, "uptime", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
463
464
rrdlabels_add(p->st_service_uptime->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
465
}
@@ -509,6 +488,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
488
perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->IISRequestsOther)) {
489
if (!p->st_request_rate) {
490
snprintfz(id, RRD_ID_LENGTH_MAX, "website_%s_requests_rate", windows_shared_buffer);
491
+ netdata_fix_chart_name(id);
492
p->st_request_rate = rrdset_create_localhost(
493
"iis",
494
id,
@@ -523,8 +503,7 @@ static bool do_web_services(PERF_DATA_BLOCK *pDataBlock, int update_every) {
503
update_every,
504
RRDSET_TYPE_LINE);
505
526
- snprintfz(id, RRD_ID_LENGTH_MAX, "iis_website_%s_requests_total", windows_shared_buffer);
527
- p->rd_request_rate = rrddim_add(p->st_request_rate, id, "requests", 1, 1, RRD_ALGORITHM_ABSOLUTE);
506
+ p->rd_request_rate = rrddim_add(p->st_request_rate, "requests", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
507
508
rrdlabels_add(p->st_request_rate->rrdlabels, "website", windows_shared_buffer, RRDLABEL_SRC_AUTO);
509
}