@cryptotaxi247 / netdata-1 / commits / 99c2c047a

Fixes Windows.plugin (Part III) (#21474)

thiagoftsm committed Dec 17, 2025 at 15:37 UTC 99c2c047a1c57e2430a7632b5ed86b08055fada8
12 files changed +337 -369
src/collectors/windows.plugin/GetServicesStatus.c
+1 -1
@@ -152,7 +152,7 @@ dict_win_services_charts_cb(const DICTIONARY_ITEM *item __maybe_unused, void *va
152 "Service state",
153 "state",
154 PLUGIN_WINDOWS_NAME,
155 - "PerflibbService",
155 + "PerflibService",
156 PRIO_SERVICE_STATE,
157 *update_every,
158 RRDSET_TYPE_LINE);
src/collectors/windows.plugin/metadata.yaml
+16 -5
@@ -202,7 +202,7 @@ modules:
202 chart_type: stacked
203 dimensions:
204 - name: paged
205 - - name: pool-paged
205 + - name: non-paged
206 - name: mem.system_page_table_entries
207 description: Unused page table entries.
208 unit: "pages"
@@ -903,6 +903,12 @@ modules:
903 chart_type: area
904 dimensions:
905 - name: semaphores
906 + - name: system.ipc_mutexes
907 + description: IPC Mutexes
908 + unit: "mutexes"
909 + chart_type: area
910 + dimensions:
911 + - name: mutexes
912 - meta:
913 plugin_name: windows.plugin
914 module_name: GetHardwareInfo
@@ -2889,19 +2895,19 @@ modules:
2895 unit: objects/s
2896 chart_type: line
2897 dimensions:
2892 - - name: objects
2898 + - name: allocated
2899 - name: netframework.clrremoting_context_proxies
2900 description: Remoting proxy objects
2901 unit: objects/s
2902 chart_type: line
2903 dimensions:
2898 - - name: contexts
2904 + - name: objects
2905 - name: netframework.clrremoting_remote_calls
2906 description: Remote Procedure Calls (RPC) invoked
2907 unit: calls/s
2908 chart_type: line
2909 dimensions:
2904 - - name: rpc
2910 + - name: calls
2911 - name: netframework.clrsecurity_link_time_checks
2912 description: Link-time code access security checks
2913 unit: checks/s
@@ -4032,7 +4038,6 @@ modules:
4038 dimensions:
4039 - name: free
4040 - name: standby
4035 - - name: available
4041 - meta:
4042 plugin_name: windows.plugin
4043 module_name: PerflibASP
@@ -4189,6 +4194,12 @@ modules:
4194 chart_type: line
4195 dimensions:
4196 - name: not found
4197 + - name: aspnet.requests_not_authorized
4198 + description: Requests that were not authorized.
4199 + unit: requests
4200 + chart_type: line
4201 + dimensions:
4202 + - name: not_authorized
4203 - name: aspnet.requests_in_application_queue
4204 description: Requests in the application queue.
4205 unit: requests
src/collectors/windows.plugin/perflib-adfs.c
+18 -29
@@ -267,11 +267,6 @@ struct adfs_certificate {
267 .ADFSWSFedTokenRequestsSuccess.key = "WS-Fed Token Requests",
268 };
269
270 -static void initialize(void)
271 -{
272 - ;
273 -}
274 -
270 void netdata_adfs_login_connection_failures(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_TYPE *pObjectType, int update_every)
271 {
272 if (!perflibGetObjectCounter(pDataBlock, pObjectType, &adfs.ADFSLoginConnectionFailure)) {
@@ -382,18 +377,18 @@ void netdata_adfs_db_artifacts_query_time_seconds(
377
378 if (!adfs.st_adfs_db_artifact_query_time_seconds_total) {
379 adfs.st_adfs_db_artifact_query_time_seconds_total = rrdset_create_localhost(
385 - "adfs",
386 - "db_artifact_query_time_seconds",
387 - NULL,
388 - "db artifact",
389 - "adfs.db_artifact_query_time_seconds",
390 - "Time taken for an artifact database query",
391 - "seconds/s",
392 - PLUGIN_WINDOWS_NAME,
393 - "PerflibADFS",
394 - PRIO_ADFS_DB_ARTIFACT_QUERY_TYME_SECONDS_TOTAL,
395 - update_every,
396 - RRDSET_TYPE_LINE);
380 + "adfs",
381 + "db_artifact_query_time_seconds",
382 + NULL,
383 + "db artifact",
384 + "adfs.db_artifact_query_time_seconds",
385 + "Time taken for an artifact database query",
386 + "seconds/s",
387 + PLUGIN_WINDOWS_NAME,
388 + "PerflibADFS",
389 + PRIO_ADFS_DB_ARTIFACT_QUERY_TIME_SECONDS_TOTAL,
390 + update_every,
391 + RRDSET_TYPE_LINE);
392
393 adfs.rd_adfs_db_artifact_query_time_seconds_total = rrddim_add(
394 adfs.st_adfs_db_artifact_query_time_seconds_total, "query_time", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
@@ -943,7 +938,7 @@ void netdata_adfs_oauth_logon_certificate_request(
938 "requests/s",
939 PLUGIN_WINDOWS_NAME,
940 "PerflibADFS",
946 - PRIO_ADFS_OAUTH_LOGON_CERTIFICATE_REQUESTS,
941 + PRIO_ADFS_OAUTH_CLIENT_LOGON_CERTIFICATE_REQUEST,
942 update_every,
943 RRDSET_TYPE_LINE);
944
@@ -988,7 +983,7 @@ void netdata_adfs_oauth_password_grant_requests(
983 "authentications/s",
984 PLUGIN_WINDOWS_NAME,
985 "PerflibADFS",
991 - PRIO_ADFS_OAUTH_PASSWORD_GRANT_REQUESTS,
986 + PRIO_ADFS_OAUTH_TOKEN_REQUESTS_SUCCESS,
987 update_every,
988 RRDSET_TYPE_LINE);
989
@@ -1209,7 +1204,7 @@ void netdata_adfs_wstrust_token_requests(PERF_DATA_BLOCK *pDataBlock, PERF_OBJEC
1204 "requests/s",
1205 PLUGIN_WINDOWS_NAME,
1206 "PerflibADFS",
1212 - PRIO_ADFS_TRUST_TOKEN_SUCCESS,
1207 + PRIO_ADFS_WSTRUST_TOKEN_SUCCESS,
1208 update_every,
1209 RRDSET_TYPE_LINE);
1210
@@ -1284,7 +1279,7 @@ void netdata_adfs_token_request(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_TYPE *p
1279 "requests/s",
1280 PLUGIN_WINDOWS_NAME,
1281 "PerflibADFS",
1287 - PRIO_ADFS_TRUST_TOKEN_SUCCESS,
1282 + PRIO_ADFS_TOKEN_REQUEST,
1283 update_every,
1284 RRDSET_TYPE_LINE);
1285
@@ -1475,13 +1470,6 @@ static bool do_ADFS(PERF_DATA_BLOCK *pDataBlock, int update_every)
1470
1471 int do_PerflibADFS(int update_every, usec_t dt __maybe_unused)
1472 {
1478 - static bool initialized = false;
1479 -
1480 - if (unlikely(!initialized)) {
1481 - initialize();
1482 - initialized = true;
1483 - }
1484 -
1473 DWORD id = RegistryFindIDByName("AD FS");
1474 if (id == PERFLIB_REGISTRY_NAME_NOT_FOUND)
1475 return -1;
@@ -1490,7 +1478,8 @@ int do_PerflibADFS(int update_every, usec_t dt __maybe_unused)
1478 if (!pDataBlock)
1479 return -1;
1480
1493 - do_ADFS(pDataBlock, update_every);
1481 + if (!do_ADFS(pDataBlock, update_every))
1482 + return -1;
1483
1484 return 0;
1485 }
src/collectors/windows.plugin/perflib-asp.c
+44 -44
@@ -84,7 +84,7 @@ struct aspnet_app {
84 COUNTER_DATA aspnetSessionsAbandoned;
85 COUNTER_DATA aspnetSessionsTimedOut;
86 COUNTER_DATA aspnetTransactionsAborted;
87 - COUNTER_DATA aspnetTransactionsCommited;
87 + COUNTER_DATA aspnetTransactionsCommitted;
88 COUNTER_DATA aspnetTransactionsPending;
89 COUNTER_DATA aspnetTransactionsPerSec;
90 COUNTER_DATA aspnetEventsRaisedPerSec;
@@ -120,7 +120,7 @@ static void aspnet_app_initialize_variables(struct aspnet_app *ap)
120 ap->aspnetSessionsAbandoned.key = "Sessions Abandoned";
121 ap->aspnetSessionsTimedOut.key = "Sessions Timed Out";
122 ap->aspnetTransactionsAborted.key = "Transactions Aborted";
123 - ap->aspnetTransactionsCommited.key = "Transactions Committed";
123 + ap->aspnetTransactionsCommitted.key = "Transactions Committed";
124 ap->aspnetTransactionsPending.key = "Transactions Pending";
125 ap->aspnetTransactionsPerSec.key = "Transactions/Sec";
126 ap->aspnetEventsRaisedPerSec.key = "Events Raised/Sec";
@@ -620,7 +620,7 @@ static void netdata_aspnet_requests_not_authorized(struct aspnet_app *aa, char *
620 NULL,
621 "aspnet",
622 "aspnet.requests_not_authorized",
623 - "Requests in the application queue.",
623 + "Requests that were not authorized.",
624 "requests",
625 PLUGIN_WINDOWS_NAME,
626 "PerflibASP",
@@ -629,7 +629,7 @@ static void netdata_aspnet_requests_not_authorized(struct aspnet_app *aa, char *
629 RRDSET_TYPE_LINE);
630
631 aa->rd_aspnet_requests_not_authorized =
632 - rrddim_add(aa->st_aspnet_requests_not_authorized, "queue", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
632 + rrddim_add(aa->st_aspnet_requests_not_authorized, "not_authorized", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
633
634 rrdlabels_add(aa->st_aspnet_requests_not_authorized->rrdlabels, "aspnet_app", app, RRDLABEL_SRC_AUTO);
635 }
@@ -894,18 +894,18 @@ static void netdata_aspnet_transactions_committed(struct aspnet_app *aa, char *a
894 snprintfz(id, RRD_ID_LENGTH_MAX, "aspnet_app_%s_transactions_committed", app);
895
896 aa->st_aspnet_transactions_committed = rrdset_create_localhost(
897 - "aspnet",
898 - id,
899 - NULL,
900 - "aspnet",
901 - "aspnet.transactions_committed",
902 - "Transactions Committed.",
903 - "transactions",
904 - PLUGIN_WINDOWS_NAME,
905 - "PerflibASP",
906 - PRIO_ASPNET_TRANSACTIONS_COMMITED,
907 - update_every,
908 - RRDSET_TYPE_LINE);
897 + "aspnet",
898 + id,
899 + NULL,
900 + "aspnet",
901 + "aspnet.transactions_committed",
902 + "Transactions Committed.",
903 + "transactions",
904 + PLUGIN_WINDOWS_NAME,
905 + "PerflibASP",
906 + PRIO_ASPNET_TRANSACTIONS_COMMITTED,
907 + update_every,
908 + RRDSET_TYPE_LINE);
909
910 aa->rd_aspnet_transactions_committed =
911 rrddim_add(aa->st_aspnet_transactions_committed, "committed", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -916,7 +916,7 @@ static void netdata_aspnet_transactions_committed(struct aspnet_app *aa, char *a
916 rrddim_set_by_pointer(
917 aa->st_aspnet_transactions_committed,
918 aa->rd_aspnet_transactions_committed,
919 - (collected_number)aa->aspnetTransactionsCommited.current.Data);
919 + (collected_number)aa->aspnetTransactionsCommitted.current.Data);
920 rrdset_done(aa->st_aspnet_transactions_committed);
921 }
922
@@ -927,18 +927,18 @@ static void netdata_aspnet_transactions_pending(struct aspnet_app *aa, char *app
927 snprintfz(id, RRD_ID_LENGTH_MAX, "aspnet_app_%s_transactions_pending", app);
928
929 aa->st_aspnet_transactions_pending = rrdset_create_localhost(
930 - "aspnet",
931 - id,
932 - NULL,
933 - "aspnet",
934 - "aspnet.transactions_pending",
935 - "Transactions Pending.",
936 - "transactions",
937 - PLUGIN_WINDOWS_NAME,
938 - "PerflibASP",
939 - PRIO_ASPNET_TRANSACTIONS_COMMITED,
940 - update_every,
941 - RRDSET_TYPE_LINE);
930 + "aspnet",
931 + id,
932 + NULL,
933 + "aspnet",
934 + "aspnet.transactions_pending",
935 + "Transactions Pending.",
936 + "transactions",
937 + PLUGIN_WINDOWS_NAME,
938 + "PerflibASP",
939 + PRIO_ASPNET_TRANSACTIONS_PENDING,
940 + update_every,
941 + RRDSET_TYPE_LINE);
942
943 aa->rd_aspnet_transactions_pending =
944 rrddim_add(aa->st_aspnet_transactions_pending, "pending", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -960,18 +960,18 @@ static void netdata_aspnet_transactions_per_sec(struct aspnet_app *aa, char *app
960 snprintfz(id, RRD_ID_LENGTH_MAX, "aspnet_app_%s_transactions_per_sec", app);
961
962 aa->st_aspnet_transactions_per_sec = rrdset_create_localhost(
963 - "aspnet",
964 - id,
965 - NULL,
966 - "aspnet",
967 - "aspnet.transactions_per_sec",
968 - "Transactions Started.",
969 - "transactions",
970 - PLUGIN_WINDOWS_NAME,
971 - "PerflibASP",
972 - PRIO_ASPNET_TRANSACTIONS_COMMITED,
973 - update_every,
974 - RRDSET_TYPE_LINE);
963 + "aspnet",
964 + id,
965 + NULL,
966 + "aspnet",
967 + "aspnet.transactions_per_sec",
968 + "Transactions Started.",
969 + "transactions",
970 + PLUGIN_WINDOWS_NAME,
971 + "PerflibASP",
972 + PRIO_ASPNET_TRANSACTIONS_PER_SEC,
973 + update_every,
974 + RRDSET_TYPE_LINE);
975
976 aa->rd_aspnet_transactions_per_sec =
977 rrddim_add(aa->st_aspnet_transactions_per_sec, "transactions", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -995,7 +995,7 @@ static inline void netdata_aspnet_apps_transactions(
995 if (perflibGetObjectCounter(pDataBlock, pObjectType, &aa->aspnetTransactionsAborted))
996 netdata_aspnet_transactions_aborted(aa, windows_shared_buffer, update_every);
997
998 - if (perflibGetObjectCounter(pDataBlock, pObjectType, &aa->aspnetTransactionsCommited))
998 + if (perflibGetObjectCounter(pDataBlock, pObjectType, &aa->aspnetTransactionsCommitted))
999 netdata_aspnet_transactions_committed(aa, windows_shared_buffer, update_every);
1000
1001 if (perflibGetObjectCounter(pDataBlock, pObjectType, &aa->aspnetTransactionsPending))
@@ -1238,7 +1238,7 @@ static void netdata_aspnet_form_authentication_success(struct aspnet_app *aa, ch
1238 "auth",
1239 PLUGIN_WINDOWS_NAME,
1240 "PerflibASP",
1241 - PRIO_ASPNET_MEMBERSHIP_AUTHENTICATION_FAILURE,
1241 + PRIO_ASPNET_FORM_AUTHENTICATION_SUCCESS,
1242 update_every,
1243 RRDSET_TYPE_LINE);
1244
@@ -1271,7 +1271,7 @@ static void netdata_aspnet_form_authentication_failure(struct aspnet_app *aa, ch
1271 "auth",
1272 PLUGIN_WINDOWS_NAME,
1273 "PerflibASP",
1274 - PRIO_ASPNET_MEMBERSHIP_AUTHENTICATION_FAILURE,
1274 + PRIO_ASPNET_FORM_AUTHENTICATION_FAILURE,
1275 update_every,
1276 RRDSET_TYPE_LINE);
1277
src/collectors/windows.plugin/perflib-exchange.c
+25 -26
@@ -693,18 +693,18 @@ static void netdata_exchange_proxy_mailbox_server_locator(struct exchange_proxy
693 snprintfz(id, RRD_ID_LENGTH_MAX, "exchange_proxy_%s_mailbox_server_locator_avg_latency_sec", proxy);
694
695 ep->st_exchange_http_proxy_server_location_avg_latency = rrdset_create_localhost(
696 - "exchange",
697 - id,
698 - NULL,
699 - "proxy",
700 - "exchange.http_proxy_mailbox_server_locator_avg_latency_sec",
701 - "Average latency of MailboxServerLocator web service calls.",
702 - "seconds",
703 - PLUGIN_WINDOWS_NAME,
704 - "PerflibExchange",
705 - PRIO_EXCHANGE_PROXY_SERVER_LOCATIOR_AVG_LATENCY,
706 - update_every,
707 - RRDSET_TYPE_LINE);
696 + "exchange",
697 + id,
698 + NULL,
699 + "proxy",
700 + "exchange.http_proxy_mailbox_server_locator_avg_latency_sec",
701 + "Average latency of MailboxServerLocator web service calls.",
702 + "seconds",
703 + PLUGIN_WINDOWS_NAME,
704 + "PerflibExchange",
705 + PRIO_EXCHANGE_PROXY_SERVER_LOCATOR_AVG_LATENCY,
706 + update_every,
707 + RRDSET_TYPE_LINE);
708
709 ep->rd_exchange_http_proxy_server_location_avg_latency = rrddim_add(
710 ep->st_exchange_http_proxy_server_location_avg_latency, "latency", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
@@ -761,18 +761,18 @@ static void netdata_exchange_proxy_request_total(struct exchange_proxy *ep, char
761 snprintfz(id, RRD_ID_LENGTH_MAX, "exchange_proxy_%s_requests_total", proxy);
762
763 ep->st_exchange_http_proxy_requests_total = rrdset_create_localhost(
764 - "exchange",
765 - id,
766 - NULL,
767 - "proxy",
768 - "exchange.http_proxy_requests",
769 - "Number of proxy requests processed each second.",
770 - "requests",
771 - PLUGIN_WINDOWS_NAME,
772 - "PerflibExchange",
773 - PRIO_EXCHANGE_PROXY_PROXY_REQUESTS_TOTAL,
774 - update_every,
775 - RRDSET_TYPE_LINE);
764 + "exchange",
765 + id,
766 + NULL,
767 + "proxy",
768 + "exchange.http_proxy_requests",
769 + "Number of proxy requests processed each second.",
770 + "requests",
771 + PLUGIN_WINDOWS_NAME,
772 + "PerflibExchange",
773 + PRIO_EXCHANGE_PROXY_REQUESTS_TOTAL,
774 + update_every,
775 + RRDSET_TYPE_LINE);
776
777 ep->rd_exchange_http_proxy_requests_total =
778 rrddim_add(ep->st_exchange_http_proxy_requests_total, "requests", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -881,7 +881,7 @@ static void netdata_exchange_workload_completed_tasks(struct exchange_workload *
881 ew->rd_exchange_workload_complete_tasks =
882 rrddim_add(ew->st_exchange_workload_complete_tasks, "completed", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
883
884 - rrdlabels_add(ew->st_exchange_workload_complete_tasks->rrdlabels, "completed", workload, RRDLABEL_SRC_AUTO);
884 + rrdlabels_add(ew->st_exchange_workload_complete_tasks->rrdlabels, "workload", workload, RRDLABEL_SRC_AUTO);
885 }
886
887 rrddim_set_by_pointer(
@@ -991,7 +991,6 @@ static void netdata_exchange_workload_activity_status(struct exchange_workload *
991 ew->st_exchange_workload_activity_status,
992 ew->rd_exchange_workload_activity_active_status,
993 (collected_number)value);
994 - rrdset_done(ew->st_exchange_workload_activity_status);
994
995 value = !value;
996 rrddim_set_by_pointer(
src/collectors/windows.plugin/perflib-hyperv.c
+2 -2
@@ -439,7 +439,7 @@ void initialize_hyperv_root_partition_keys(struct hypervisor_root_partition *p)
439 p->IOTLBFlushesSec.key = "I/O TLB Flushes/sec";
440 p->AddressSpaces.key = "Address Spaces";
441 p->VirtualTLBPages.key = "Virtual TLB Pages";
442 - p->VirtualTLBFlushEntiresSec.key = "Virtual TLB Flush Entires/sec";
442 + p->VirtualTLBFlushEntiresSec.key = "Virtual TLB Flush Entries/sec";
443 }
444
445 // Callback function for inserting root partition metrics into the dictionary
@@ -1557,7 +1557,7 @@ static bool do_hyperv_network_adapter(PERF_DATA_BLOCK *pDataBlock, int update_ev
1557 "packets/s",
1558 _COMMON_PLUGIN_NAME,
1559 _COMMON_PLUGIN_MODULE_NAME,
1560 - NETDATA_CHART_PRIO_WINDOWS_HYPERV_VM_NET_INTERFACE_PACKETS,
1560 + NETDATA_CHART_PRIO_WINDOWS_HYPERV_VM_NET_INTERFACE_BROADCAST_PACKETS,
1561 update_every,
1562 RRDSET_TYPE_LINE);
1563
src/collectors/windows.plugin/perflib-memory.c
+1 -1
@@ -143,7 +143,7 @@ static void do_memory_system_pool(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT_TYPE
143 RRDSET_TYPE_STACKED);
144
145 localPool.rd_paged = rrddim_add(localPool.pool, "paged", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
146 - localPool.rd_nonpaged = rrddim_add(localPool.pool, "pool-paged", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
146 + localPool.rd_nonpaged = rrddim_add(localPool.pool, "non-paged", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
147 }
148
149 rrddim_set_by_pointer(localPool.pool, localPool.rd_paged, (collected_number)localPool.pagedData.current.Data);
src/collectors/windows.plugin/perflib-netframework.c
+15 -63
@@ -887,9 +887,8 @@ static void netdata_framework_clr_remoting(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
887 update_every,
888 RRDSET_TYPE_LINE);
889
890 - snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrremoting_channels_total", windows_shared_buffer);
890 p->rd_clrremoting_channels =
892 - rrddim_add(p->st_clrremoting_channels, id, "registered", 1, 1, RRD_ALGORITHM_INCREMENTAL);
891 + rrddim_add(p->st_clrremoting_channels, "registered", "registered", 1, 1, RRD_ALGORITHM_INCREMENTAL);
892
893 rrdlabels_add(
894 p->st_clrremoting_channels->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -919,13 +918,8 @@ static void netdata_framework_clr_remoting(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
918 update_every,
919 RRDSET_TYPE_LINE);
920
922 - snprintfz(
923 - id,
924 - RRD_ID_LENGTH_MAX,
925 - "netframework_%s_clrremoting_context_bound_classes_loaded",
926 - windows_shared_buffer);
921 p->rd_clrremoting_context_bound_classes_loaded = rrddim_add(
928 - p->st_clrremoting_context_bound_classes_loaded, id, "loaded", 1, 1, RRD_ALGORITHM_ABSOLUTE);
922 + p->st_clrremoting_context_bound_classes_loaded, "loaded", "loaded", 1, 1, RRD_ALGORITHM_ABSOLUTE);
923
924 rrdlabels_add(
925 p->st_clrremoting_context_bound_classes_loaded->rrdlabels,
@@ -958,13 +952,8 @@ static void netdata_framework_clr_remoting(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
952 update_every,
953 RRDSET_TYPE_LINE);
954
961 - snprintfz(
962 - id,
963 - RRD_ID_LENGTH_MAX,
964 - "netframework_%s_clrremoting_context_bound_objects_total",
965 - windows_shared_buffer);
955 p->rd_clrremoting_context_bound_objects = rrddim_add(
967 - p->st_clrremoting_context_bound_objects, id, "allocated", 1, 1, RRD_ALGORITHM_INCREMENTAL);
956 + p->st_clrremoting_context_bound_objects, "allocated", "allocated", 1, 1, RRD_ALGORITHM_INCREMENTAL);
957
958 rrdlabels_add(
959 p->st_clrremoting_context_bound_objects->rrdlabels,
@@ -996,10 +985,8 @@ static void netdata_framework_clr_remoting(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
985 update_every,
986 RRDSET_TYPE_LINE);
987
999 - snprintfz(
1000 - id, RRD_ID_LENGTH_MAX, "netframework_%s_clrremoting_context_proxies_total", windows_shared_buffer);
988 p->rd_clrremoting_context_proxies =
1002 - rrddim_add(p->st_clrremoting_context_proxies, id, "objects", 1, 1, RRD_ALGORITHM_INCREMENTAL);
989 + rrddim_add(p->st_clrremoting_context_proxies, "objects", "objects", 1, 1, RRD_ALGORITHM_INCREMENTAL);
990
991 rrdlabels_add(
992 p->st_clrremoting_context_proxies->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -1029,9 +1016,8 @@ static void netdata_framework_clr_remoting(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
1016 update_every,
1017 RRDSET_TYPE_LINE);
1018
1032 - snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrremoting_contexts", windows_shared_buffer);
1019 p->rd_clrremoting_contexts =
1034 - rrddim_add(p->st_clrremoting_contexts, id, "contexts", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1020 + rrddim_add(p->st_clrremoting_contexts, "contexts", "contexts", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1021
1022 rrdlabels_add(
1023 p->st_clrremoting_contexts->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -1061,10 +1047,8 @@ static void netdata_framework_clr_remoting(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
1047 update_every,
1048 RRDSET_TYPE_LINE);
1049
1064 - snprintfz(
1065 - id, RRD_ID_LENGTH_MAX, "netframework_%s_clrremoting_remote_calls_total", windows_shared_buffer);
1050 p->rd_clrremoting_remote_calls =
1067 - rrddim_add(p->st_clrremoting_remote_calls, id, "contexts", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1051 + rrddim_add(p->st_clrremoting_remote_calls, "calls", "calls", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1052
1053 rrdlabels_add(
1054 p->st_clrremoting_remote_calls->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -1114,10 +1098,8 @@ static void netdata_framework_clr_security(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
1098 update_every,
1099 RRDSET_TYPE_LINE);
1100
1117 - snprintfz(
1118 - id, RRD_ID_LENGTH_MAX, "netframework_%s_clrsecurity_link_time_checks_total", windows_shared_buffer);
1101 p->rd_clrsecurity_link_time_checks =
1120 - rrddim_add(p->st_clrsecurity_link_time_checks, id, "linktime", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1102 + rrddim_add(p->st_clrsecurity_link_time_checks, "linktime", "linktime", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1103
1104 rrdlabels_add(
1105 p->st_clrsecurity_link_time_checks->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -1148,10 +1130,8 @@ static void netdata_framework_clr_security(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
1130 update_every,
1131 RRDSET_TYPE_LINE);
1132
1151 - snprintfz(
1152 - id, RRD_ID_LENGTH_MAX, "netframework_%s_clrsecurity_checks_time_percent", windows_shared_buffer);
1133 p->rd_clrsecurity_rt_checks_time =
1154 - rrddim_add(p->st_clrsecurity_rt_checks_time, id, "time", 1, 100, RRD_ALGORITHM_ABSOLUTE);
1134 + rrddim_add(p->st_clrsecurity_rt_checks_time, "time", "time", 1, 100, RRD_ALGORITHM_ABSOLUTE);
1135
1136 rrdlabels_add(
1137 p->st_clrsecurity_rt_checks_time->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -1184,9 +1164,8 @@ static void netdata_framework_clr_security(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
1164 update_every,
1165 RRDSET_TYPE_LINE);
1166
1187 - snprintfz(id, RRD_ID_LENGTH_MAX, "netframework_%s_clrsecurity_stack_walk_depth", windows_shared_buffer);
1167 p->rd_clrsecurity_stack_walk_depth =
1189 - rrddim_add(p->st_clrsecurity_stack_walk_depth, id, "stack", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1168 + rrddim_add(p->st_clrsecurity_stack_walk_depth, "stack", "stack", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1169
1170 rrdlabels_add(
1171 p->st_clrsecurity_stack_walk_depth->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -1216,10 +1195,8 @@ static void netdata_framework_clr_security(PERF_DATA_BLOCK *pDataBlock, PERF_OBJ
1195 update_every,
1196 RRDSET_TYPE_LINE);
1197
1219 - snprintfz(
1220 - id, RRD_ID_LENGTH_MAX, "netframework_%s_clrsecurity_runtime_checks_total", windows_shared_buffer);
1198 p->rd_clrsecurity_run_time_checks =
1222 - rrddim_add(p->st_clrsecurity_run_time_checks, id, "runtime", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1199 + rrddim_add(p->st_clrsecurity_run_time_checks, "runtime", "runtime", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1200
1201 rrdlabels_add(
1202 p->st_clrsecurity_run_time_checks->rrdlabels, "process", windows_shared_buffer, RRDLABEL_SRC_AUTO);
@@ -1270,13 +1247,8 @@ netdata_framework_clr_locks_and_threads(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT
1247 update_every,
1248 RRDSET_TYPE_LINE);
1249
1273 - snprintfz(
1274 - id,
1275 - RRD_ID_LENGTH_MAX,
1276 - "netframework_%s_clrlocksandthreads_queue_length_total",
1277 - windows_shared_buffer);
1250 p->rd_locksandthreads_queue_length =
1279 - rrddim_add(p->st_clrlocksandthreads_queue_length, id, "threads", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1251 + rrddim_add(p->st_clrlocksandthreads_queue_length, "threads", "threads", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1252
1253 rrdlabels_add(
1254 p->st_clrlocksandthreads_queue_length->rrdlabels,
@@ -1310,13 +1282,8 @@ netdata_framework_clr_locks_and_threads(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT
1282 update_every,
1283 RRDSET_TYPE_LINE);
1284
1313 - snprintfz(
1314 - id,
1315 - RRD_ID_LENGTH_MAX,
1316 - "netframework_%s_clrlocksandthreads_current_logical_threads",
1317 - windows_shared_buffer);
1285 p->rd_locksandthreads_current_logical_threads = rrddim_add(
1319 - p->st_clrlocksandthreads_current_logical_threads, id, "logical", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1286 + p->st_clrlocksandthreads_current_logical_threads, "logical", "logical", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1287
1288 rrdlabels_add(
1289 p->st_clrlocksandthreads_current_logical_threads->rrdlabels,
@@ -1350,13 +1317,8 @@ netdata_framework_clr_locks_and_threads(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT
1317 update_every,
1318 RRDSET_TYPE_LINE);
1319
1353 - snprintfz(
1354 - id,
1355 - RRD_ID_LENGTH_MAX,
1356 - "netframework_%s_clrlocksandthreads_physical_threads_current",
1357 - windows_shared_buffer);
1320 p->rd_locksandthreads_current_physical_threads = rrddim_add(
1359 - p->st_clrlocksandthreads_current_physical_threads, id, "physical", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1321 + p->st_clrlocksandthreads_current_physical_threads, "physical", "physical", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1322
1323 rrdlabels_add(
1324 p->st_clrlocksandthreads_current_physical_threads->rrdlabels,
@@ -1389,13 +1351,8 @@ netdata_framework_clr_locks_and_threads(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT
1351 update_every,
1352 RRDSET_TYPE_LINE);
1353
1392 - snprintfz(
1393 - id,
1394 - RRD_ID_LENGTH_MAX,
1395 - "netframework_%s_clrlocksandthreads_recognized_threads_total",
1396 - windows_shared_buffer);
1354 p->rd_locksandthreads_recognized_threads = rrddim_add(
1398 - p->st_clrlocksandthreads_recognized_threads, id, "threads", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1355 + p->st_clrlocksandthreads_recognized_threads, "threads", "threads", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1356
1357 rrdlabels_add(
1358 p->st_clrlocksandthreads_recognized_threads->rrdlabels,
@@ -1428,13 +1385,8 @@ netdata_framework_clr_locks_and_threads(PERF_DATA_BLOCK *pDataBlock, PERF_OBJECT
1385 update_every,
1386 RRDSET_TYPE_LINE);
1387
1431 - snprintfz(
1432 - id,
1433 - RRD_ID_LENGTH_MAX,
1434 - "netframework_%s_clrlocksandthreads_contentions_total",
1435 - windows_shared_buffer);
1388 p->rd_locksandthreads_contentions = rrddim_add(
1437 - p->st_clrlocksandthreads_contentions, id, "contentions", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1389 + p->st_clrlocksandthreads_contentions, "contentions", "contentions", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1390
1391 rrdlabels_add(
1392 p->st_clrlocksandthreads_contentions->rrdlabels,
src/collectors/windows.plugin/perflib-numa.c
-8
@@ -6,11 +6,9 @@
6 struct netdata_numa {
7 RRDSET *st_numa;
8 RRDDIM *rd_standby;
9 - RRDDIM *rd_available;
9 RRDDIM *rd_free_zero;
10
11 COUNTER_DATA standby;
13 - COUNTER_DATA available;
12 COUNTER_DATA free_zero;
13 };
14
@@ -21,7 +19,6 @@ static void numa_insert_cb(const DICTIONARY_ITEM *item __maybe_unused, void *val
19 struct netdata_numa *d = value;
20
21 d->standby.key = "Standby List MBytes";
24 - d->available.key = "Available MBytes";
22 d->free_zero.key = "Free & Zero Page List MBytes";
23 }
24
@@ -58,14 +55,10 @@ static void netdata_numa_chart(struct netdata_numa *nn, int update_every)
55 nn->rd_free_zero = rrddim_add(nn->st_numa, "free", NULL, MEGA_FACTOR, 1, RRD_ALGORITHM_ABSOLUTE);
56
57 nn->rd_standby = rrddim_add(nn->st_numa, "standby", NULL, MEGA_FACTOR, 1, RRD_ALGORITHM_ABSOLUTE);
61 -
62 - nn->rd_available = rrddim_add(nn->st_numa, "available", NULL, MEGA_FACTOR, 1, RRD_ALGORITHM_ABSOLUTE);
58 }
59
60 rrddim_set_by_pointer(nn->st_numa, nn->rd_free_zero, (collected_number)nn->free_zero.current.Data);
61
67 - rrddim_set_by_pointer(nn->st_numa, nn->rd_available, (collected_number)nn->available.current.Data);
68 -
62 rrddim_set_by_pointer(nn->st_numa, nn->rd_standby, (collected_number)nn->standby.current.Data);
63
64 rrdset_done(nn->st_numa);
@@ -92,7 +85,6 @@ static bool do_numa(PERF_DATA_BLOCK *pDataBlock, int update_every)
85 struct netdata_numa *nn = dictionary_set(numa_dict, windows_shared_buffer, NULL, sizeof(*nn));
86
87 perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &nn->standby);
95 - perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &nn->available);
88 perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &nn->free_zero);
89 netdata_numa_chart(nn, update_every);
90 }
src/collectors/windows.plugin/perflib-objects.c
+23
@@ -19,12 +19,35 @@ static bool do_objects(PERF_DATA_BLOCK *pDataBlock, int update_every)
19 return false;
20
21 static COUNTER_DATA semaphores = {.key = "Semaphores"};
22 + static COUNTER_DATA mutexes = {.key = "Mutexes"};
23
24 if (perflibGetObjectCounter(pDataBlock, pObjectType, &semaphores)) {
25 ULONGLONG sem = (ULONGLONG)semaphores.current.Data;
26 common_semaphore_ipc(sem, (NETDATA_DOUBLE)WINDOWS_MAX_KERNEL_OBJECT, _COMMON_PLUGIN_MODULE_NAME, update_every);
27 }
28
29 + if (perflibGetObjectCounter(pDataBlock, pObjectType, &mutexes)) {
30 + static RRDSET *st = NULL;
31 + static RRDDIM *rd = NULL;
32 + if (unlikely(!st)) {
33 + st = rrdset_create_localhost("system",
34 + "ipc_mutexes",
35 + NULL,
36 + "ipc",
37 + "system.ipc_mutexes",
38 + "IPC Mutexes",
39 + "mutexes",
40 + _COMMON_PLUGIN_NAME,
41 + _COMMON_PLUGIN_MODULE_NAME,
42 + NETDATA_CHART_PRIO_SYSTEM_IPC_SEMAPHORES + 1,
43 + update_every,
44 + RRDSET_TYPE_AREA);
45 + rd = rrddim_add(st, "mutexes", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
46 + }
47 + rrddim_set_by_pointer(st, rd, (collected_number)mutexes.current.Data);
48 + rrdset_done(st);
49 + }
50 +
51 return true;
52 }
53
src/collectors/windows.plugin/perflib-web-service.c
+183 -183
@@ -94,64 +94,64 @@ struct web_service {
94 };
95
96 struct ws3svc_w3wp_data {
97 - RRDSET *st_wescv_w3wp_active_threads;
98 - RRDDIM *rd_wescv_w3wp_active_threads;
97 + RRDSET *st_w3svc_w3wp_active_threads;
98 + RRDDIM *rd_w3svc_w3wp_active_threads;
99
100 - RRDSET *st_wescv_w3wp_requests_total;
101 - RRDDIM *rd_wescv_w3wp_requests_total;
100 + RRDSET *st_w3svc_w3wp_requests_total;
101 + RRDDIM *rd_w3svc_w3wp_requests_total;
102
103 - RRDSET *st_wescv_w3wp_requests_active;
104 - RRDDIM *rd_wescv_w3wp_requests_active;
103 + RRDSET *st_w3svc_w3wp_requests_active;
104 + RRDDIM *rd_w3svc_w3wp_requests_active;
105
106 - RRDSET *st_wescv_w3wp_file_cache_mem_usage;
107 - RRDDIM *rd_wescv_w3wp_file_cache_mem_usage;
106 + RRDSET *st_w3svc_w3wp_file_cache_mem_usage;
107 + RRDDIM *rd_w3svc_w3wp_file_cache_mem_usage;
108
109 - RRDSET *st_wescv_w3wp_files_cache_total;
110 - RRDDIM *rd_wescv_w3wp_files_cache_total;
109 + RRDSET *st_w3svc_w3wp_files_cache_total;
110 + RRDDIM *rd_w3svc_w3wp_files_cache_total;
111
112 - RRDSET *st_wescv_w3wp_files_flushed_total;
113 - RRDDIM *rd_wescv_w3wp_files_flushed_total;
112 + RRDSET *st_w3svc_w3wp_files_flushed_total;
113 + RRDDIM *rd_w3svc_w3wp_files_flushed_total;
114
115 - RRDSET *st_wescv_w3wp_uri_cache_flushed;
116 - RRDDIM *rd_wescv_w3wp_uri_cache_flushed;
115 + RRDSET *st_w3svc_w3wp_uri_cache_flushed;
116 + RRDDIM *rd_w3svc_w3wp_uri_cache_flushed;
117
118 - RRDSET *st_wescv_w3wp_total_uri_cached;
119 - RRDDIM *rd_wescv_w3wp_total_uri_cached;
118 + RRDSET *st_w3svc_w3wp_total_uri_cached;
119 + RRDDIM *rd_w3svc_w3wp_total_uri_cached;
120
121 - RRDSET *st_wescv_w3wp_total_metadata_cache;
122 - RRDDIM *rd_wescv_w3wp_total_metadata_cache;
121 + RRDSET *st_w3svc_w3wp_total_metadata_cache;
122 + RRDDIM *rd_w3svc_w3wp_total_metadata_cache;
123
124 - RRDSET *st_wescv_w3wp_total_metadata_flushed;
125 - RRDDIM *rd_wescv_w3wp_total_metadata_flushed;
124 + RRDSET *st_w3svc_w3wp_total_metadata_flushed;
125 + RRDDIM *rd_w3svc_w3wp_total_metadata_flushed;
126
127 - RRDSET *st_wescv_w3wp_output_cache_active_flushed_items;
128 - RRDDIM *rd_wescv_w3wp_output_cache_active_flushed_items;
127 + RRDSET *st_w3svc_w3wp_output_cache_active_flushed_items;
128 + RRDDIM *rd_w3svc_w3wp_output_cache_active_flushed_items;
129
130 - RRDSET *st_wescv_w3wp_output_cache_memory_usage;
131 - RRDDIM *rd_wescv_w3wp_output_cache_memory_usage;
130 + RRDSET *st_w3svc_w3wp_output_cache_memory_usage;
131 + RRDDIM *rd_w3svc_w3wp_output_cache_memory_usage;
132
133 - RRDSET *st_wescv_w3wp_output_cache_flushed_total;
134 - RRDDIM *rd_wescv_w3wp_output_cache_flushed_total;
133 + RRDSET *st_w3svc_w3wp_output_cache_flushed_total;
134 + RRDDIM *rd_w3svc_w3wp_output_cache_flushed_total;
135
136 - COUNTER_DATA WESCVW3WPActiveThreads;
136 + COUNTER_DATA W3SVCW3WPActiveThreads;
137
138 - COUNTER_DATA WESCVW3WPRequestTotal;
139 - COUNTER_DATA WESCVW3WPRequestActive;
138 + COUNTER_DATA W3SVCW3WPRequestTotal;
139 + COUNTER_DATA W3SVCW3WPRequestActive;
140
141 - COUNTER_DATA WESCVW3WPFileCacheMemUsage;
141 + COUNTER_DATA W3SVCW3WPFileCacheMemUsage;
142
143 - COUNTER_DATA WESCVW3WPFilesCachedTotal;
144 - COUNTER_DATA WESCVW3WPFilesFlushedTotal;
143 + COUNTER_DATA W3SVCW3WPFilesCachedTotal;
144 + COUNTER_DATA W3SVCW3WPFilesFlushedTotal;
145
146 - COUNTER_DATA WESCVW3WPURICachedFlushed;
147 - COUNTER_DATA WESCVW3WPTotalURICached;
146 + COUNTER_DATA W3SVCW3WPURICachedFlushed;
147 + COUNTER_DATA W3SVCW3WPTotalURICached;
148
149 - COUNTER_DATA WESCVW3WPTotalMetadataCached;
150 - COUNTER_DATA WESCVW3WPTotalMetadataFlushed;
149 + COUNTER_DATA W3SVCW3WPTotalMetadataCached;
150 + COUNTER_DATA W3SVCW3WPTotalMetadataFlushed;
151
152 - COUNTER_DATA WESCVW3WPOutputCacheActiveFlushedItens;
153 - COUNTER_DATA WESCVW3WPOutputCacheMemoryUsage;
154 - COUNTER_DATA WESCVW3WPOutputCacheFlushesTotal;
152 + COUNTER_DATA W3SVCW3WPOutputCacheActiveFlushedItems;
153 + COUNTER_DATA W3SVCW3WPOutputCacheMemoryUsage;
154 + COUNTER_DATA W3SVCW3WPOutputCacheFlushesTotal;
155 };
156
157 // AD information
@@ -271,25 +271,25 @@ void dict_app_pool_insert_cb(const DICTIONARY_ITEM *item __maybe_unused, void *v
271
272 static inline void initialize_w3svc_w3wp_keys(struct ws3svc_w3wp_data *p)
273 {
274 - p->WESCVW3WPActiveThreads.key = "Active Threads Count";
274 + p->W3SVCW3WPActiveThreads.key = "Active Threads Count";
275
276 - p->WESCVW3WPRequestTotal.key = "Total HTTP Requests Served";
277 - p->WESCVW3WPRequestActive.key = "Active Requests";
276 + p->W3SVCW3WPRequestTotal.key = "Total HTTP Requests Served";
277 + p->W3SVCW3WPRequestActive.key = "Active Requests";
278
279 - p->WESCVW3WPFileCacheMemUsage.key = "Current File Cache Memory Usage";
279 + p->W3SVCW3WPFileCacheMemUsage.key = "Current File Cache Memory Usage";
280
281 - p->WESCVW3WPFilesCachedTotal.key = "Total Files Cached";
282 - p->WESCVW3WPFilesFlushedTotal.key = "Total Flushed Files";
281 + p->W3SVCW3WPFilesCachedTotal.key = "Total Files Cached";
282 + p->W3SVCW3WPFilesFlushedTotal.key = "Total Flushed Files";
283
284 - p->WESCVW3WPURICachedFlushed.key = "Total Flushed URIs";
285 - p->WESCVW3WPTotalURICached.key = "Total URIs Cached";
284 + p->W3SVCW3WPURICachedFlushed.key = "Total Flushed URIs";
285 + p->W3SVCW3WPTotalURICached.key = "Total URIs Cached";
286
287 - p->WESCVW3WPTotalMetadataCached.key = "Total Metadata Cached";
288 - p->WESCVW3WPTotalMetadataFlushed.key = "Total Flushed Metadata";
287 + p->W3SVCW3WPTotalMetadataCached.key = "Total Metadata Cached";
288 + p->W3SVCW3WPTotalMetadataFlushed.key = "Total Flushed Metadata";
289
290 - p->WESCVW3WPOutputCacheActiveFlushedItens.key = "Output Cache Current Flushed Items";
291 - p->WESCVW3WPOutputCacheMemoryUsage.key = "Output Cache Current Memory Usage";
292 - p->WESCVW3WPOutputCacheFlushesTotal.key = "Output Cache Total Flushes";
290 + p->W3SVCW3WPOutputCacheActiveFlushedItems.key = "Output Cache Current Flushed Items";
291 + p->W3SVCW3WPOutputCacheMemoryUsage.key = "Output Cache Current Memory Usage";
292 + p->W3SVCW3WPOutputCacheFlushesTotal.key = "Output Cache Total Flushes";
293 }
294
295 void dict_wesvc_w3wp_insert_cb(const DICTIONARY_ITEM *item __maybe_unused, void *value, void *data __maybe_unused)
@@ -424,7 +424,7 @@ static inline void netdata_webservice_active_connection(
424 "Website active connections",
425 "connections",
426 PLUGIN_WINDOWS_NAME,
427 - "PerflibWebService1",
427 + "PerflibWebService",
428 PRIO_WEBSITE_IIS_ACTIVE_CONNECTIONS_COUNT,
429 update_every,
430 RRDSET_TYPE_LINE);
@@ -1385,12 +1385,12 @@ static inline void w3svc_w3wp_active_threads(
1385 int update_every,
1386 char *app_name)
1387 {
1388 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPActiveThreads)) {
1389 - if (!p->st_wescv_w3wp_active_threads) {
1388 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPActiveThreads)) {
1389 + if (!p->st_w3svc_w3wp_active_threads) {
1390 char id[RRD_ID_LENGTH_MAX + 1];
1391 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_active_threads", app_name);
1392 netdata_fix_chart_name(id);
1393 - p->st_wescv_w3wp_active_threads = rrdset_create_localhost(
1393 + p->st_w3svc_w3wp_active_threads = rrdset_create_localhost(
1394 "iis",
1395 id,
1396 NULL,
@@ -1404,17 +1404,17 @@ static inline void w3svc_w3wp_active_threads(
1404 update_every,
1405 RRDSET_TYPE_LINE);
1406
1407 - p->rd_wescv_w3wp_active_threads =
1408 - rrddim_add(p->st_wescv_w3wp_active_threads, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1409 - rrdlabels_add(p->st_wescv_w3wp_active_threads->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1407 + p->rd_w3svc_w3wp_active_threads =
1408 + rrddim_add(p->st_w3svc_w3wp_active_threads, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1409 + rrdlabels_add(p->st_w3svc_w3wp_active_threads->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1410 }
1411
1412 rrddim_set_by_pointer(
1413 - p->st_wescv_w3wp_active_threads,
1414 - p->rd_wescv_w3wp_active_threads,
1415 - (collected_number)p->WESCVW3WPActiveThreads.current.Data);
1413 + p->st_w3svc_w3wp_active_threads,
1414 + p->rd_w3svc_w3wp_active_threads,
1415 + (collected_number)p->W3SVCW3WPActiveThreads.current.Data);
1416
1417 - rrdset_done(p->st_wescv_w3wp_active_threads);
1417 + rrdset_done(p->st_w3svc_w3wp_active_threads);
1418 }
1419 }
1420
@@ -1426,12 +1426,12 @@ static inline void w3svc_w3wp_requests_total(
1426 int update_every,
1427 char *app_name)
1428 {
1429 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPRequestTotal)) {
1430 - if (!p->st_wescv_w3wp_requests_total) {
1429 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPRequestTotal)) {
1430 + if (!p->st_w3svc_w3wp_requests_total) {
1431 char id[RRD_ID_LENGTH_MAX + 1];
1432 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_requests_total", app_name);
1433 netdata_fix_chart_name(id);
1434 - p->st_wescv_w3wp_requests_total = rrdset_create_localhost(
1434 + p->st_w3svc_w3wp_requests_total = rrdset_create_localhost(
1435 "iis",
1436 id,
1437 NULL,
@@ -1445,17 +1445,17 @@ static inline void w3svc_w3wp_requests_total(
1445 update_every,
1446 RRDSET_TYPE_LINE);
1447
1448 - p->rd_wescv_w3wp_requests_total =
1449 - rrddim_add(p->st_wescv_w3wp_requests_total, "requests", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1450 - rrdlabels_add(p->st_wescv_w3wp_requests_total->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1448 + p->rd_w3svc_w3wp_requests_total =
1449 + rrddim_add(p->st_w3svc_w3wp_requests_total, "requests", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1450 + rrdlabels_add(p->st_w3svc_w3wp_requests_total->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1451 }
1452
1453 rrddim_set_by_pointer(
1454 - p->st_wescv_w3wp_requests_total,
1455 - p->rd_wescv_w3wp_requests_total,
1456 - (collected_number)p->WESCVW3WPRequestTotal.current.Data);
1454 + p->st_w3svc_w3wp_requests_total,
1455 + p->rd_w3svc_w3wp_requests_total,
1456 + (collected_number)p->W3SVCW3WPRequestTotal.current.Data);
1457
1458 - rrdset_done(p->st_wescv_w3wp_requests_total);
1458 + rrdset_done(p->st_w3svc_w3wp_requests_total);
1459 }
1460 }
1461
@@ -1467,12 +1467,12 @@ static inline void w3svc_w3wp_requests_active(
1467 int update_every,
1468 char *app_name)
1469 {
1470 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPRequestActive)) {
1471 - if (!p->st_wescv_w3wp_requests_active) {
1470 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPRequestActive)) {
1471 + if (!p->st_w3svc_w3wp_requests_active) {
1472 char id[RRD_ID_LENGTH_MAX + 1];
1473 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_requests_active", app_name);
1474 netdata_fix_chart_name(id);
1475 - p->st_wescv_w3wp_requests_active = rrdset_create_localhost(
1475 + p->st_w3svc_w3wp_requests_active = rrdset_create_localhost(
1476 "iis",
1477 id,
1478 NULL,
@@ -1486,17 +1486,17 @@ static inline void w3svc_w3wp_requests_active(
1486 update_every,
1487 RRDSET_TYPE_LINE);
1488
1489 - p->rd_wescv_w3wp_requests_active =
1490 - rrddim_add(p->st_wescv_w3wp_requests_active, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1491 - rrdlabels_add(p->st_wescv_w3wp_requests_active->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1489 + p->rd_w3svc_w3wp_requests_active =
1490 + rrddim_add(p->st_w3svc_w3wp_requests_active, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1491 + rrdlabels_add(p->st_w3svc_w3wp_requests_active->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1492 }
1493
1494 rrddim_set_by_pointer(
1495 - p->st_wescv_w3wp_requests_active,
1496 - p->rd_wescv_w3wp_requests_active,
1497 - (collected_number)p->WESCVW3WPRequestActive.current.Data);
1495 + p->st_w3svc_w3wp_requests_active,
1496 + p->rd_w3svc_w3wp_requests_active,
1497 + (collected_number)p->W3SVCW3WPRequestActive.current.Data);
1498
1499 - rrdset_done(p->st_wescv_w3wp_requests_active);
1499 + rrdset_done(p->st_w3svc_w3wp_requests_active);
1500 }
1501 }
1502
@@ -1508,12 +1508,12 @@ static inline void w3svc_w3wp_file_cache_mem_usage(
1508 int update_every,
1509 char *app_name)
1510 {
1511 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPFileCacheMemUsage)) {
1512 - if (!p->st_wescv_w3wp_file_cache_mem_usage) {
1511 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPFileCacheMemUsage)) {
1512 + if (!p->st_w3svc_w3wp_file_cache_mem_usage) {
1513 char id[RRD_ID_LENGTH_MAX + 1];
1514 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_file_cache_mem_usage", app_name);
1515 netdata_fix_chart_name(id);
1516 - p->st_wescv_w3wp_file_cache_mem_usage = rrdset_create_localhost(
1516 + p->st_w3svc_w3wp_file_cache_mem_usage = rrdset_create_localhost(
1517 "iis",
1518 id,
1519 NULL,
@@ -1527,17 +1527,17 @@ static inline void w3svc_w3wp_file_cache_mem_usage(
1527 update_every,
1528 RRDSET_TYPE_AREA);
1529
1530 - p->rd_wescv_w3wp_file_cache_mem_usage =
1531 - rrddim_add(p->st_wescv_w3wp_file_cache_mem_usage, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1532 - rrdlabels_add(p->st_wescv_w3wp_file_cache_mem_usage->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1530 + p->rd_w3svc_w3wp_file_cache_mem_usage =
1531 + rrddim_add(p->st_w3svc_w3wp_file_cache_mem_usage, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1532 + rrdlabels_add(p->st_w3svc_w3wp_file_cache_mem_usage->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1533 }
1534
1535 rrddim_set_by_pointer(
1536 - p->st_wescv_w3wp_file_cache_mem_usage,
1537 - p->rd_wescv_w3wp_file_cache_mem_usage,
1538 - (collected_number)p->WESCVW3WPFileCacheMemUsage.current.Data);
1536 + p->st_w3svc_w3wp_file_cache_mem_usage,
1537 + p->rd_w3svc_w3wp_file_cache_mem_usage,
1538 + (collected_number)p->W3SVCW3WPFileCacheMemUsage.current.Data);
1539
1540 - rrdset_done(p->st_wescv_w3wp_file_cache_mem_usage);
1540 + rrdset_done(p->st_w3svc_w3wp_file_cache_mem_usage);
1541 }
1542 }
1543
@@ -1549,12 +1549,12 @@ static inline void w3svc_w3wp_files_cached_total(
1549 int update_every,
1550 char *app_name)
1551 {
1552 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPFilesCachedTotal)) {
1553 - if (!p->st_wescv_w3wp_files_cache_total) {
1552 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPFilesCachedTotal)) {
1553 + if (!p->st_w3svc_w3wp_files_cache_total) {
1554 char id[RRD_ID_LENGTH_MAX + 1];
1555 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_files_cache_total", app_name);
1556 netdata_fix_chart_name(id);
1557 - p->st_wescv_w3wp_files_cache_total = rrdset_create_localhost(
1557 + p->st_w3svc_w3wp_files_cache_total = rrdset_create_localhost(
1558 "iis",
1559 id,
1560 NULL,
@@ -1568,17 +1568,17 @@ static inline void w3svc_w3wp_files_cached_total(
1568 update_every,
1569 RRDSET_TYPE_LINE);
1570
1571 - p->rd_wescv_w3wp_files_cache_total =
1572 - rrddim_add(p->st_wescv_w3wp_files_cache_total, "cached_files", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1573 - rrdlabels_add(p->st_wescv_w3wp_files_cache_total->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1571 + p->rd_w3svc_w3wp_files_cache_total =
1572 + rrddim_add(p->st_w3svc_w3wp_files_cache_total, "cached_files", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1573 + rrdlabels_add(p->st_w3svc_w3wp_files_cache_total->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1574 }
1575
1576 rrddim_set_by_pointer(
1577 - p->st_wescv_w3wp_files_cache_total,
1578 - p->rd_wescv_w3wp_files_cache_total,
1579 - (collected_number)p->WESCVW3WPFilesCachedTotal.current.Data);
1577 + p->st_w3svc_w3wp_files_cache_total,
1578 + p->rd_w3svc_w3wp_files_cache_total,
1579 + (collected_number)p->W3SVCW3WPFilesCachedTotal.current.Data);
1580
1581 - rrdset_done(p->st_wescv_w3wp_files_cache_total);
1581 + rrdset_done(p->st_w3svc_w3wp_files_cache_total);
1582 }
1583 }
1584
@@ -1590,12 +1590,12 @@ static inline void w3svc_w3wp_files_flushed_total(
1590 int update_every,
1591 char *app_name)
1592 {
1593 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPFilesFlushedTotal)) {
1594 - if (!p->st_wescv_w3wp_files_flushed_total) {
1593 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPFilesFlushedTotal)) {
1594 + if (!p->st_w3svc_w3wp_files_flushed_total) {
1595 char id[RRD_ID_LENGTH_MAX + 1];
1596 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_files_flushed_total", app_name);
1597 netdata_fix_chart_name(id);
1598 - p->st_wescv_w3wp_files_flushed_total = rrdset_create_localhost(
1598 + p->st_w3svc_w3wp_files_flushed_total = rrdset_create_localhost(
1599 "iis",
1600 id,
1601 NULL,
@@ -1609,17 +1609,17 @@ static inline void w3svc_w3wp_files_flushed_total(
1609 update_every,
1610 RRDSET_TYPE_LINE);
1611
1612 - p->rd_wescv_w3wp_files_flushed_total =
1613 - rrddim_add(p->st_wescv_w3wp_files_flushed_total, "file_handles", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1614 - rrdlabels_add(p->st_wescv_w3wp_files_flushed_total->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1612 + p->rd_w3svc_w3wp_files_flushed_total =
1613 + rrddim_add(p->st_w3svc_w3wp_files_flushed_total, "file_handles", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1614 + rrdlabels_add(p->st_w3svc_w3wp_files_flushed_total->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1615 }
1616
1617 rrddim_set_by_pointer(
1618 - p->st_wescv_w3wp_files_flushed_total,
1619 - p->rd_wescv_w3wp_files_flushed_total,
1620 - (collected_number)p->WESCVW3WPFilesFlushedTotal.current.Data);
1618 + p->st_w3svc_w3wp_files_flushed_total,
1619 + p->rd_w3svc_w3wp_files_flushed_total,
1620 + (collected_number)p->W3SVCW3WPFilesFlushedTotal.current.Data);
1621
1622 - rrdset_done(p->st_wescv_w3wp_files_flushed_total);
1622 + rrdset_done(p->st_w3svc_w3wp_files_flushed_total);
1623 }
1624 }
1625
@@ -1631,12 +1631,12 @@ static inline void w3svc_w3wp_uri_cached_flushed(
1631 int update_every,
1632 char *app_name)
1633 {
1634 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPURICachedFlushed)) {
1635 - if (!p->st_wescv_w3wp_uri_cache_flushed) {
1634 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPURICachedFlushed)) {
1635 + if (!p->st_w3svc_w3wp_uri_cache_flushed) {
1636 char id[RRD_ID_LENGTH_MAX + 1];
1637 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_uri_cache_flushed", app_name);
1638 netdata_fix_chart_name(id);
1639 - p->st_wescv_w3wp_uri_cache_flushed = rrdset_create_localhost(
1639 + p->st_w3svc_w3wp_uri_cache_flushed = rrdset_create_localhost(
1640 "iis",
1641 id,
1642 NULL,
@@ -1650,17 +1650,17 @@ static inline void w3svc_w3wp_uri_cached_flushed(
1650 update_every,
1651 RRDSET_TYPE_LINE);
1652
1653 - p->rd_wescv_w3wp_uri_cache_flushed =
1654 - rrddim_add(p->st_wescv_w3wp_uri_cache_flushed, "cached_uris", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1655 - rrdlabels_add(p->st_wescv_w3wp_uri_cache_flushed->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1653 + p->rd_w3svc_w3wp_uri_cache_flushed =
1654 + rrddim_add(p->st_w3svc_w3wp_uri_cache_flushed, "cached_uris", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1655 + rrdlabels_add(p->st_w3svc_w3wp_uri_cache_flushed->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1656 }
1657
1658 rrddim_set_by_pointer(
1659 - p->st_wescv_w3wp_uri_cache_flushed,
1660 - p->rd_wescv_w3wp_uri_cache_flushed,
1661 - (collected_number)p->WESCVW3WPURICachedFlushed.current.Data);
1659 + p->st_w3svc_w3wp_uri_cache_flushed,
1660 + p->rd_w3svc_w3wp_uri_cache_flushed,
1661 + (collected_number)p->W3SVCW3WPURICachedFlushed.current.Data);
1662
1663 - rrdset_done(p->st_wescv_w3wp_uri_cache_flushed);
1663 + rrdset_done(p->st_w3svc_w3wp_uri_cache_flushed);
1664 }
1665 }
1666
@@ -1672,12 +1672,12 @@ static inline void w3svc_w3wp_total_uri_cached(
1672 int update_every,
1673 char *app_name)
1674 {
1675 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPTotalURICached)) {
1676 - if (!p->st_wescv_w3wp_total_uri_cached) {
1675 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPTotalURICached)) {
1676 + if (!p->st_w3svc_w3wp_total_uri_cached) {
1677 char id[RRD_ID_LENGTH_MAX + 1];
1678 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_total_uri_cached", app_name);
1679 netdata_fix_chart_name(id);
1680 - p->st_wescv_w3wp_total_uri_cached = rrdset_create_localhost(
1680 + p->st_w3svc_w3wp_total_uri_cached = rrdset_create_localhost(
1681 "iis",
1682 id,
1683 NULL,
@@ -1691,17 +1691,17 @@ static inline void w3svc_w3wp_total_uri_cached(
1691 update_every,
1692 RRDSET_TYPE_LINE);
1693
1694 - p->rd_wescv_w3wp_total_uri_cached =
1695 - rrddim_add(p->st_wescv_w3wp_total_uri_cached, "uri_cache_blocks", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1696 - rrdlabels_add(p->st_wescv_w3wp_total_uri_cached->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1694 + p->rd_w3svc_w3wp_total_uri_cached =
1695 + rrddim_add(p->st_w3svc_w3wp_total_uri_cached, "uri_cache_blocks", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1696 + rrdlabels_add(p->st_w3svc_w3wp_total_uri_cached->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1697 }
1698
1699 rrddim_set_by_pointer(
1700 - p->st_wescv_w3wp_total_uri_cached,
1701 - p->rd_wescv_w3wp_total_uri_cached,
1702 - (collected_number)p->WESCVW3WPTotalURICached.current.Data);
1700 + p->st_w3svc_w3wp_total_uri_cached,
1701 + p->rd_w3svc_w3wp_total_uri_cached,
1702 + (collected_number)p->W3SVCW3WPTotalURICached.current.Data);
1703
1704 - rrdset_done(p->st_wescv_w3wp_total_uri_cached);
1704 + rrdset_done(p->st_w3svc_w3wp_total_uri_cached);
1705 }
1706 }
1707
@@ -1713,12 +1713,12 @@ static inline void w3svc_w3wp_total_metadata_cached(
1713 int update_every,
1714 char *app_name)
1715 {
1716 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPTotalMetadataCached)) {
1717 - if (!p->st_wescv_w3wp_total_metadata_cache) {
1716 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPTotalMetadataCached)) {
1717 + if (!p->st_w3svc_w3wp_total_metadata_cache) {
1718 char id[RRD_ID_LENGTH_MAX + 1];
1719 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_total_metadata_cache", app_name);
1720 netdata_fix_chart_name(id);
1721 - p->st_wescv_w3wp_total_metadata_cache = rrdset_create_localhost(
1721 + p->st_w3svc_w3wp_total_metadata_cache = rrdset_create_localhost(
1722 "iis",
1723 id,
1724 NULL,
@@ -1732,17 +1732,17 @@ static inline void w3svc_w3wp_total_metadata_cached(
1732 update_every,
1733 RRDSET_TYPE_LINE);
1734
1735 - p->rd_wescv_w3wp_total_metadata_cache =
1736 - rrddim_add(p->st_wescv_w3wp_total_metadata_cache, "metadata_blocks", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1737 - rrdlabels_add(p->st_wescv_w3wp_total_metadata_cache->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1735 + p->rd_w3svc_w3wp_total_metadata_cache =
1736 + rrddim_add(p->st_w3svc_w3wp_total_metadata_cache, "metadata_blocks", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1737 + rrdlabels_add(p->st_w3svc_w3wp_total_metadata_cache->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1738 }
1739
1740 rrddim_set_by_pointer(
1741 - p->st_wescv_w3wp_total_metadata_cache,
1742 - p->rd_wescv_w3wp_total_metadata_cache,
1743 - (collected_number)p->WESCVW3WPTotalMetadataCached.current.Data);
1741 + p->st_w3svc_w3wp_total_metadata_cache,
1742 + p->rd_w3svc_w3wp_total_metadata_cache,
1743 + (collected_number)p->W3SVCW3WPTotalMetadataCached.current.Data);
1744
1745 - rrdset_done(p->st_wescv_w3wp_total_metadata_cache);
1745 + rrdset_done(p->st_w3svc_w3wp_total_metadata_cache);
1746 }
1747 }
1748
@@ -1754,12 +1754,12 @@ static inline void w3svc_w3wp_total_metadata_flushed(
1754 int update_every,
1755 char *app_name)
1756 {
1757 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPTotalMetadataFlushed)) {
1758 - if (!p->st_wescv_w3wp_total_metadata_flushed) {
1757 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPTotalMetadataFlushed)) {
1758 + if (!p->st_w3svc_w3wp_total_metadata_flushed) {
1759 char id[RRD_ID_LENGTH_MAX + 1];
1760 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_total_metadata_flushed", app_name);
1761 netdata_fix_chart_name(id);
1762 - p->st_wescv_w3wp_total_metadata_flushed = rrdset_create_localhost(
1762 + p->st_w3svc_w3wp_total_metadata_flushed = rrdset_create_localhost(
1763 "iis",
1764 id,
1765 NULL,
@@ -1773,17 +1773,17 @@ static inline void w3svc_w3wp_total_metadata_flushed(
1773 update_every,
1774 RRDSET_TYPE_LINE);
1775
1776 - p->rd_wescv_w3wp_total_metadata_flushed =
1777 - rrddim_add(p->st_wescv_w3wp_total_metadata_flushed, "metadata_blocks", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1778 - rrdlabels_add(p->st_wescv_w3wp_total_metadata_flushed->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1776 + p->rd_w3svc_w3wp_total_metadata_flushed =
1777 + rrddim_add(p->st_w3svc_w3wp_total_metadata_flushed, "metadata_blocks", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1778 + rrdlabels_add(p->st_w3svc_w3wp_total_metadata_flushed->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1779 }
1780
1781 rrddim_set_by_pointer(
1782 - p->st_wescv_w3wp_total_metadata_flushed,
1783 - p->rd_wescv_w3wp_total_metadata_flushed,
1784 - (collected_number)p->WESCVW3WPTotalMetadataFlushed.current.Data);
1782 + p->st_w3svc_w3wp_total_metadata_flushed,
1783 + p->rd_w3svc_w3wp_total_metadata_flushed,
1784 + (collected_number)p->W3SVCW3WPTotalMetadataFlushed.current.Data);
1785
1786 - rrdset_done(p->st_wescv_w3wp_total_metadata_flushed);
1786 + rrdset_done(p->st_w3svc_w3wp_total_metadata_flushed);
1787 }
1788 }
1789
@@ -1795,12 +1795,12 @@ static inline void w3svc_w3wp_output_cache_active_flushed_items(
1795 int update_every,
1796 char *app_name)
1797 {
1798 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPOutputCacheActiveFlushedItens)) {
1799 - if (!p->st_wescv_w3wp_output_cache_active_flushed_items) {
1798 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPOutputCacheActiveFlushedItems)) {
1799 + if (!p->st_w3svc_w3wp_output_cache_active_flushed_items) {
1800 char id[RRD_ID_LENGTH_MAX + 1];
1801 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_output_cache_active_flushed_items", app_name);
1802 netdata_fix_chart_name(id);
1803 - p->st_wescv_w3wp_output_cache_active_flushed_items = rrdset_create_localhost(
1803 + p->st_w3svc_w3wp_output_cache_active_flushed_items = rrdset_create_localhost(
1804 "iis",
1805 id,
1806 NULL,
@@ -1814,18 +1814,18 @@ static inline void w3svc_w3wp_output_cache_active_flushed_items(
1814 update_every,
1815 RRDSET_TYPE_LINE);
1816
1817 - p->rd_wescv_w3wp_output_cache_active_flushed_items = rrddim_add(
1818 - p->st_wescv_w3wp_output_cache_active_flushed_items, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1817 + p->rd_w3svc_w3wp_output_cache_active_flushed_items = rrddim_add(
1818 + p->st_w3svc_w3wp_output_cache_active_flushed_items, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1819 rrdlabels_add(
1820 - p->st_wescv_w3wp_output_cache_active_flushed_items->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1820 + p->st_w3svc_w3wp_output_cache_active_flushed_items->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1821 }
1822
1823 rrddim_set_by_pointer(
1824 - p->st_wescv_w3wp_output_cache_active_flushed_items,
1825 - p->rd_wescv_w3wp_output_cache_active_flushed_items,
1826 - (collected_number)p->WESCVW3WPOutputCacheActiveFlushedItens.current.Data);
1824 + p->st_w3svc_w3wp_output_cache_active_flushed_items,
1825 + p->rd_w3svc_w3wp_output_cache_active_flushed_items,
1826 + (collected_number)p->W3SVCW3WPOutputCacheActiveFlushedItems.current.Data);
1827
1828 - rrdset_done(p->st_wescv_w3wp_output_cache_active_flushed_items);
1828 + rrdset_done(p->st_w3svc_w3wp_output_cache_active_flushed_items);
1829 }
1830 }
1831
@@ -1837,12 +1837,12 @@ static inline void w3svc_w3wp_output_cache_memory_usage(
1837 int update_every,
1838 char *app_name)
1839 {
1840 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPOutputCacheMemoryUsage)) {
1841 - if (!p->st_wescv_w3wp_output_cache_memory_usage) {
1840 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPOutputCacheMemoryUsage)) {
1841 + if (!p->st_w3svc_w3wp_output_cache_memory_usage) {
1842 char id[RRD_ID_LENGTH_MAX + 1];
1843 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_output_cache_memory_usage", app_name);
1844 netdata_fix_chart_name(id);
1845 - p->st_wescv_w3wp_output_cache_memory_usage = rrdset_create_localhost(
1845 + p->st_w3svc_w3wp_output_cache_memory_usage = rrdset_create_localhost(
1846 "iis",
1847 id,
1848 NULL,
@@ -1856,17 +1856,17 @@ static inline void w3svc_w3wp_output_cache_memory_usage(
1856 update_every,
1857 RRDSET_TYPE_AREA);
1858
1859 - p->rd_wescv_w3wp_output_cache_memory_usage =
1860 - rrddim_add(p->st_wescv_w3wp_output_cache_memory_usage, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1861 - rrdlabels_add(p->st_wescv_w3wp_output_cache_memory_usage->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1859 + p->rd_w3svc_w3wp_output_cache_memory_usage =
1860 + rrddim_add(p->st_w3svc_w3wp_output_cache_memory_usage, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1861 + rrdlabels_add(p->st_w3svc_w3wp_output_cache_memory_usage->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1862 }
1863
1864 rrddim_set_by_pointer(
1865 - p->st_wescv_w3wp_output_cache_memory_usage,
1866 - p->rd_wescv_w3wp_output_cache_memory_usage,
1867 - (collected_number)p->WESCVW3WPOutputCacheMemoryUsage.current.Data);
1865 + p->st_w3svc_w3wp_output_cache_memory_usage,
1866 + p->rd_w3svc_w3wp_output_cache_memory_usage,
1867 + (collected_number)p->W3SVCW3WPOutputCacheMemoryUsage.current.Data);
1868
1869 - rrdset_done(p->st_wescv_w3wp_output_cache_memory_usage);
1869 + rrdset_done(p->st_w3svc_w3wp_output_cache_memory_usage);
1870 }
1871 }
1872
@@ -1878,12 +1878,12 @@ static inline void w3svc_w3wp_output_cache_flushed_total(
1878 int update_every,
1879 char *app_name)
1880 {
1881 - if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->WESCVW3WPOutputCacheFlushesTotal)) {
1882 - if (!p->st_wescv_w3wp_output_cache_flushed_total) {
1881 + if (perflibGetInstanceCounter(pDataBlock, pObjectType, pi, &p->W3SVCW3WPOutputCacheFlushesTotal)) {
1882 + if (!p->st_w3svc_w3wp_output_cache_flushed_total) {
1883 char id[RRD_ID_LENGTH_MAX + 1];
1884 snprintfz(id, RRD_ID_LENGTH_MAX, "w3svc_w3wp_%s_output_cache_flushed_total", app_name);
1885 netdata_fix_chart_name(id);
1886 - p->st_wescv_w3wp_output_cache_flushed_total = rrdset_create_localhost(
1886 + p->st_w3svc_w3wp_output_cache_flushed_total = rrdset_create_localhost(
1887 "iis",
1888 id,
1889 NULL,
@@ -1897,17 +1897,17 @@ static inline void w3svc_w3wp_output_cache_flushed_total(
1897 update_every,
1898 RRDSET_TYPE_LINE);
1899
1900 - p->rd_wescv_w3wp_output_cache_flushed_total = rrddim_add(
1901 - p->st_wescv_w3wp_output_cache_flushed_total, "output_cache_entries", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1902 - rrdlabels_add(p->st_wescv_w3wp_output_cache_flushed_total->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1900 + p->rd_w3svc_w3wp_output_cache_flushed_total = rrddim_add(
1901 + p->st_w3svc_w3wp_output_cache_flushed_total, "output_cache_entries", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1902 + rrdlabels_add(p->st_w3svc_w3wp_output_cache_flushed_total->rrdlabels, "app", app_name, RRDLABEL_SRC_AUTO);
1903 }
1904
1905 rrddim_set_by_pointer(
1906 - p->st_wescv_w3wp_output_cache_flushed_total,
1907 - p->rd_wescv_w3wp_output_cache_flushed_total,
1908 - (collected_number)p->WESCVW3WPOutputCacheFlushesTotal.current.Data);
1906 + p->st_w3svc_w3wp_output_cache_flushed_total,
1907 + p->rd_w3svc_w3wp_output_cache_flushed_total,
1908 + (collected_number)p->W3SVCW3WPOutputCacheFlushesTotal.current.Data);
1909
1910 - rrdset_done(p->st_wescv_w3wp_output_cache_flushed_total);
1910 + rrdset_done(p->st_w3svc_w3wp_output_cache_flushed_total);
1911 }
1912 }
1913
src/collectors/windows.plugin/windows_plugin.h
+9 -7
@@ -242,7 +242,7 @@ enum PERFLIB_PRIO {
242 PRIO_ADFS_LOGIN_CONNECTION_FAILURES_TOTAL,
243 PRIO_ADFS_CERTIFICATE_AUTHENTICATION_TOTAL,
244 PRIO_ADFS_DB_ARTIFACT_FAILURE_TOTAL,
245 - PRIO_ADFS_DB_ARTIFACT_QUERY_TYME_SECONDS_TOTAL,
245 + PRIO_ADFS_DB_ARTIFACT_QUERY_TIME_SECONDS_TOTAL,
246 PRIO_ADFS_DB_CONFIG_FAILURE_TOTAL,
247 PRIO_ADFS_DB_CONFIG_QUERY_TYME_SECONDS_TOTAL,
248 PRIO_ADFS_DEVICE_AUTHENTICATIONS_TOTAL,
@@ -257,16 +257,18 @@ enum PERFLIB_PRIO {
257 PRIO_ADFS_OAUTH_CLIENT_SECRET_BASIC_AUTH,
258 PRIO_ADFS_OAUTH_CLIENT_SECRET_POST_AUTH,
259 PRIO_ADFS_OAUTH_CLIENT_WINDOWS_AUTH,
260 - PRIO_ADFS_OAUTH_LOGON_CERTIFICATE_REQUESTS,
261 - PRIO_ADFS_OAUTH_PASSWORD_GRANT_REQUESTS,
260 + PRIO_ADFS_OAUTH_CLIENT_LOGON_CERTIFICATE_REQUEST,
261 + PRIO_ADFS_OAUTH_TOKEN_REQUESTS_SUCCESS,
262
263 PRIO_ADFS_PASSIVE_REQUESTS,
264 PRIO_ADFS_PASSPORT_AUTHENTICATOR,
265 PRIO_ADFS_PASSWORD_CHANGE_REQUEST,
266 PRIO_ADFS_SAMLP_TOKEN_REQUESTS,
267 PRIO_ADFS_SSO_AUTH,
268 - PRIO_ADFS_TRUST_TOKEN_SUCCESS,
268 + PRIO_ADFS_TOKEN_REQUEST,
269 PRIO_ADFS_USER_PASS_AUTH,
270 + PRIO_ADFS_TRUST_TOKEN_SUCCESS,
271 + PRIO_ADFS_WSTRUST_TOKEN_SUCCESS,
272 PRIO_ADFS_WSFED_TOKEN_REQUESTS,
273
274 PRIO_EXCHANGE_QUEUE_ACTIVE_MAILBOX_DELIVERY,
@@ -296,9 +298,9 @@ enum PERFLIB_PRIO {
298 PRIO_EXCHANGE_PROXY_AVG_AUTH_LATENCY,
299 PRIO_EXCHANGE_PROXY_AVG_CAS_PROCESSING_LATENCY,
300 PRIO_EXCHANGE_PROXY_MAILBOX_PROXY_FAILURE,
299 - PRIO_EXCHANGE_PROXY_SERVER_LOCATIOR_AVG_LATENCY,
301 + PRIO_EXCHANGE_PROXY_SERVER_LOCATOR_AVG_LATENCY,
302 PRIO_EXCHANGE_PROXY_OUTSTANDING_PROXY_REQUESTS,
301 - PRIO_EXCHANGE_PROXY_PROXY_REQUESTS_TOTAL,
303 + PRIO_EXCHANGE_PROXY_REQUESTS_TOTAL,
304 PRIO_EXCHANGE_AUTO_DISCOVER_REQUESTS,
305 PRIO_EXCHANGE_AUTO_AVAILABILITY_SERVICES,
306
@@ -322,7 +324,7 @@ enum PERFLIB_PRIO {
324 PRIO_ASPNET_SESSIONS_ABANDONED,
325 PRIO_ASPNET_SESSIONS_TIMEDOUT,
326 PRIO_ASPNET_TRANSACTIONS_ABORTED,
325 - PRIO_ASPNET_TRANSACTIONS_COMMITED,
327 + PRIO_ASPNET_TRANSACTIONS_COMMITTED,
328 PRIO_ASPNET_TRANSACTIONS_PENDING,
329 PRIO_ASPNET_TRANSACTIONS_PER_SEC,
330 PRIO_ASPNET_EVENTS_RAISED_PER_SEC,