Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 76 insertions, 1 deletions

diff --git a/src/collectors/windows.plugin/windows_plugin.h b/src/collectors/windows.plugin/windows_plugin.h
index 73c1ecda1..3852653ed 100644
--- a/src/collectors/windows.plugin/windows_plugin.h
+++ b/src/collectors/windows.plugin/windows_plugin.h
@@ -24,7 +24,82 @@ int do_PerflibProcesses(int update_every, usec_t dt);
 int do_PerflibProcessor(int update_every, usec_t dt);
 int do_PerflibMemory(int update_every, usec_t dt);
 int do_PerflibObjects(int update_every, usec_t dt);
+int do_PerflibThermalZone(int update_every, usec_t dt);
+int do_PerflibWebService(int update_every, usec_t dt);
+int do_PerflibMSSQL(int update_every, usec_t dt);
+int do_PerflibNetFramework(int update_every, usec_t dt);
 
-#include "perflib.h"
+enum PERFLIB_PRIO {
+    PRIO_WEBSITE_IIS_REQUESTS_RATE = 21000, // PRIO selected, because APPS is using 20YYY
+    PRIO_WEBSITE_IIS_REQUESTS_BY_TYPE_RATE,
+    PRIO_WEBSITE_IIS_TRAFFIC,
+    PRIO_WEBSITE_IIS_FTP_FILE_TRANSFER_RATE,
+    PRIO_WEBSITE_IIS_ACTIVE_CONNECTIONS_COUNT,
+    PRIO_WEBSITE_IIS_CONNECTIONS_ATTEMP,
+    PRIO_WEBSITE_IIS_USERS,
+    PRIO_WEBSITE_IIS_ISAPI_EXT_REQUEST_COUNT,
+    PRIO_WEBSITE_IIS_ISAPI_EXT_REQUEST_RATE,
+    PRIO_WEBSITE_IIS_ERRORS_RATE,
+    PRIO_WEBSITE_IIS_LOGON_ATTEMPTS,
+    PRIO_WEBSITE_IIS_UPTIME,
+
+    PRIO_MSSQL_USER_CONNECTIONS,
+
+    PRIO_MSSQL_DATABASE_TRANSACTIONS,
+    PRIO_MSSQL_DATABASE_ACTIVE_TRANSACTIONS,
+    PRIO_MSSQL_DATABASE_WRITE_TRANSACTIONS,
+    PRIO_MSSQL_DATABASE_BACKUP_RESTORE_OPERATIONS,
+    PRIO_MSSQL_DATABASE_LOG_FLUSHES,
+    PRIO_MSSQL_DATABASE_LOG_FLUSHED,
+
+    PRIO_MSSQL_DATABASE_DATA_FILE_SIZE,
+
+    PRIO_MSSQL_STATS_BATCH_REQUEST,
+    PRIO_MSSQL_STATS_COMPILATIONS,
+    PRIO_MSSQL_STATS_RECOMPILATIONS,
+    PRIO_MSSQL_STATS_AUTO_PARAMETRIZATION,
+    PRIO_MSSQL_STATS_SAFE_AUTO_PARAMETRIZATION,
+
+    PRIO_MSSQL_BLOCKED_PROCESSES,
+
+    PRIO_MSSQL_BUFF_CACHE_HIT_RATIO,
+    PRIO_MSSQL_BUFF_MAN_IOPS,
+    PRIO_MSSQL_BUFF_CHECKPOINT_PAGES,
+    PRIO_MSSQL_BUFF_METHODS_PAGE_SPLIT,
+    PRIO_MSSQL_BUFF_PAGE_LIFE_EXPECTANCY,
+
+    PRIO_MSSQL_MEMMGR_CONNECTION_MEMORY_BYTES,
+    PRIO_MSSQL_MEMMGR_TOTAL_SERVER,
+    PRIO_MSSQL_MEMMGR_EXTERNAL_BENEFIT_OF_MEMORY,
+    PRIO_MSSQL_MEMMGR_PENDING_MEMORY_GRANTS,
+
+    PRIO_MSSQL_LOCKS_WAIT,
+    PRIO_MSSQL_LOCKS_DEADLOCK,
+
+    PRIO_MSSQL_SQL_ERRORS,
+
+    PRIO_NETFRAMEWORK_CLR_EXCEPTION_THROWN,
+    PRIO_NETFRAMEWORK_CLR_EXCEPTION_FILTERS,
+    PRIO_NETFRAMEWORK_CLR_EXCEPTION_FINALLYS,
+    PRIO_NETFRAMEWORK_CLR_EXCEPTION_THROW_TO_CATCH_DEPTH,
+
+    PRIO_NETFRAMEWORK_CLR_INTEROP_CCW,
+    PRIO_NETFRAMEWORK_CLR_INTEROP_MARSHALLING,
+    PRIO_NETFRAMEWORK_CLR_INTEROP_STUBS_CREATED,
+
+    PRIO_NETFRAMEWORK_CLR_JIT_METHODS,
+    PRIO_NETFRAMEWORK_CLR_JIT_TIME,
+    PRIO_NETFRAMEWORK_CLR_JIT_STANDARD_FAILURES,
+    PRIO_NETFRAMEWORK_CLR_JIT_IL_BYTES,
+
+    PRIO_NETFRAMEWORK_CLR_LOADING_HEAP_SIZE,
+    PRIO_NETFRAMEWORK_CLR_LOADING_APP_DOMAINS_LOADED,
+    PRIO_NETFRAMEWORK_CLR_LOADING_APP_DOMAINS_UNLOADED,
+    PRIO_NETFRAMEWORK_CLR_LOADING_ASSEMBLIES_LOADED,
+    PRIO_NETFRAMEWORK_CLR_LOADING_CLASSES_LOADED,
+    PRIO_NETFRAMEWORK_CLR_LOADING_CLASS_LOAD_FAILURE
+};
+
+int do_PerflibHyperV(int update_every, usec_t dt);
 
 #endif //NETDATA_WINDOWS_PLUGIN_H