added option to get normalized thread pool load average; number of digits after ...

diff --git a/ChangeLog b/ChangeLog
index 46fe50e..834cdcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
 - New attributes "source" and "sourceId" in NXSL class "Event"
 - New method toJson() in NXSL class "Event
 - LVM monitoring parameters on AIX
+- Added option to get normalized server thread pool load average
+- Fixed bug in self-monitoring termplates
 - Management console
         - Fixed possible deadlock when executing server script
         - Fixed area charts on dashboards

diff --git a/contrib/templates/netxms_server.xml b/contrib/templates/netxms_server.xml
index e393074..f9c823d 100644 (file)
--- a/contrib/templates/netxms_server.xml
+++ b/contrib/templates/netxms_server.xml
@@ -5,6 +5,7 @@
        <events>
                <event id="100000">
                        <name>DC_SERVER_THREAD_POOL_TOO_BUSY</name>
+                       <guid>cd143bac-10f2-4e09-a1f6-bba5e2369a71</guid>
                        <code>100000</code>
                        <severity>2</severity>
                        <flags>1</flags>
@@ -13,7 +14,7 @@
                </event>
        </events>
        <templates>
-               <template id="188">
+               <template id="102">
                        <guid>989f562b-f3c6-452c-b3de-55107456d784</guid>
                        <name>Thread pools</name>
                        <flags>3</flags>
@@ -22,16 +23,16 @@
                                <element id="2">NetXMS Server</element>
                        </path>
                        <dataCollection>
-                               <dci id="120">
-                                       <guid>6714a626-71d2-4113-956e-876ea7cd8e04</guid>
-                                       <name>Server.ThreadPool.Load(MAIN)</name>
-                                       <description>Server thread pool MAIN: current load</description>
-                                       <dataType>0</dataType>
+                               <dci id="11">
+                                       <guid>873c9487-652d-499b-adf3-2689f6e5cc28</guid>
+                                       <name>Server.ThreadPool.LoadAverage(AGENT,1)</name>
+                                       <description>Server thread pool AGENT: normalized load average (1 minute)</description>
+                                       <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance></instance>
+                                       <instance>AGENT</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -39,20 +40,32 @@
                                        <snmpPort>0</snmpPort>
                                        <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
                                        <transformation></transformation>
+                                       <thresholds>
+                                               <threshold id="1">
+                                                       <function>0</function>
+                                                       <condition>4</condition>
+                                                       <value>1</value>
+                                                       <activationEvent>DC_SERVER_THREAD_POOL_TOO_BUSY</activationEvent>
+                                                       <deactivationEvent>SYS_THRESHOLD_REARMED</deactivationEvent>
+                                                       <sampleCount>5</sampleCount>
+                                                       <repeatInterval>-1</repeatInterval>
+                                                       <script></script>
+                                               </threshold>
+                                       </thresholds>
                                        <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="121">
-                                       <guid>1fefd164-b840-4ea3-855c-3fcb10ea8d65</guid>
-                                       <name>Server.ThreadPool.CurrSize(MAIN)</name>
-                                       <description>Server thread pool MAIN: current size</description>
+                               <dci id="12">
+                                       <guid>22ceb0dc-fe66-44c2-9bcf-d2dbad642912</guid>
+                                       <name>Server.ThreadPool.Usage(AGENT)</name>
+                                       <description>Server thread pool AGENT: usage</description>
                                        <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance></instance>
+                                       <instance>AGENT</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -64,16 +77,16 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="122">
-                                       <guid>d29153c1-9753-4bd1-8f99-82e149c75946</guid>
-                                       <name>Server.ThreadPool.LoadAverage(MAIN)</name>
-                                       <description>Server thread pool MAIN: load average (1 minute)</description>
-                                       <dataType>5</dataType>
+                               <dci id="10">
+                                       <guid>06ea9ad8-a237-445e-a782-bcb36e34b57e</guid>
+                                       <name>Server.ThreadPool.CurrSize(AGENT)</name>
+                                       <description>Server thread pool AGENT: current size</description>
+                                       <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance>MAIN</instance>
+                                       <instance>AGENT</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -81,32 +94,20 @@
                                        <snmpPort>0</snmpPort>
                                        <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
                                        <transformation></transformation>
-                                       <thresholds>
-                                               <threshold id="1">
-                                                       <function>0</function>
-                                                       <condition>4</condition>
-                                                       <value>1</value>
-                                                       <activationEvent>DC_SERVER_THREAD_POOL_TOO_BUSY</activationEvent>
-                                                       <deactivationEvent>SYS_THRESHOLD_REARMED</deactivationEvent>
-                                                       <sampleCount>5</sampleCount>
-                                                       <repeatInterval>-1</repeatInterval>
-                                                       <script></script>
-                                               </threshold>
-                                       </thresholds>
                                        <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="123">
-                                       <guid>8e90cf85-e0cd-4302-bdab-7cdd385b138b</guid>
-                                       <name>Server.ThreadPool.Usage(MAIN)</name>
-                                       <description>Server thread pool MAIN: usage</description>
+                               <dci id="16">
+                                       <guid>0112f75b-b98f-40fb-ba30-8422538d6174</guid>
+                                       <name>Server.ThreadPool.Usage(SCHEDULER)</name>
+                                       <description>Server thread pool SCHEDULER: usage</description>
                                        <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance></instance>
+                                       <instance>SCHEDULER</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -118,7 +119,7 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="124">
+                               <dci id="5">
                                        <guid>ed84ee94-6eb3-46d3-bf4b-6eb64452eeb3</guid>
                                        <name>Server.ThreadPool.Load(POLLERS)</name>
                                        <description>Server thread pool POLLERS: current load</description>
@@ -139,16 +140,16 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="125">
-                                       <guid>8d9e28a0-a528-4658-97fe-ce7388a073f1</guid>
-                                       <name>Server.ThreadPool.CurrSize(POLLERS)</name>
-                                       <description>Server thread pool POLLERS: current size</description>
+                               <dci id="9">
+                                       <guid>be4e940c-4b1f-4d96-84b0-3a9a9fcad138</guid>
+                                       <name>Server.ThreadPool.Load(AGENT)</name>
+                                       <description>Server thread pool AGENT: current load</description>
                                        <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance></instance>
+                                       <instance>AGENT</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -160,40 +161,7 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="126">
-                                       <guid>06a8d7f2-ad9c-490e-b3a2-032e936c8f87</guid>
-                                       <name>Server.ThreadPool.LoadAverage(POLLERS)</name>
-                                       <description>Server thread pool POLLERS: load average (1 minute)</description>
-                                       <dataType>5</dataType>
-                                       <samples>0</samples>
-                                       <origin>0</origin>
-                                       <interval>0</interval>
-                                       <retention>0</retention>
-                                       <instance>POLLERS</instance>
-                                       <systemTag></systemTag>
-                                       <delta>0</delta>
-                                       <flags>0</flags>
-                                       <snmpRawValueType>0</snmpRawValueType>
-                                       <snmpPort>0</snmpPort>
-                                       <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
-                                       <transformation></transformation>
-                                       <thresholds>
-                                               <threshold id="1">
-                                                       <function>0</function>
-                                                       <condition>4</condition>
-                                                       <value>1</value>
-                                                       <activationEvent>DC_SERVER_THREAD_POOL_TOO_BUSY</activationEvent>
-                                                       <deactivationEvent>SYS_THRESHOLD_REARMED</deactivationEvent>
-                                                       <sampleCount>5</sampleCount>
-                                                       <repeatInterval>-1</repeatInterval>
-                                                       <script></script>
-                                               </threshold>
-                                       </thresholds>
-                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
-                                       <instanceDiscoveryData></instanceDiscoveryData>
-                                       <instanceFilter></instanceFilter>
-                               </dci>
-                               <dci id="127">
+                               <dci id="8">
                                        <guid>ce453669-1588-47b5-b57c-23a514562d30</guid>
                                        <name>Server.ThreadPool.Usage(POLLERS)</name>
                                        <description>Server thread pool POLLERS: usage</description>
@@ -214,16 +182,16 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="128">
-                                       <guid>be4e940c-4b1f-4d96-84b0-3a9a9fcad138</guid>
-                                       <name>Server.ThreadPool.Load(AGENT)</name>
-                                       <description>Server thread pool AGENT: current load</description>
+                               <dci id="6">
+                                       <guid>8d9e28a0-a528-4658-97fe-ce7388a073f1</guid>
+                                       <name>Server.ThreadPool.CurrSize(POLLERS)</name>
+                                       <description>Server thread pool POLLERS: current size</description>
                                        <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance>AGENT</instance>
+                                       <instance></instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -235,16 +203,16 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="129">
-                                       <guid>06ea9ad8-a237-445e-a782-bcb36e34b57e</guid>
-                                       <name>Server.ThreadPool.CurrSize(AGENT)</name>
-                                       <description>Server thread pool AGENT: current size</description>
+                               <dci id="4">
+                                       <guid>8e90cf85-e0cd-4302-bdab-7cdd385b138b</guid>
+                                       <name>Server.ThreadPool.Usage(MAIN)</name>
+                                       <description>Server thread pool MAIN: usage</description>
                                        <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance>AGENT</instance>
+                                       <instance></instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -256,16 +224,16 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="130">
-                                       <guid>873c9487-652d-499b-adf3-2689f6e5cc28</guid>
-                                       <name>Server.ThreadPool.LoadAverage(AGENT)</name>
-                                       <description>Server thread pool AGENT: load average (1 minute)</description>
+                               <dci id="3">
+                                       <guid>d29153c1-9753-4bd1-8f99-82e149c75946</guid>
+                                       <name>Server.ThreadPool.LoadAverage(MAIN,1)</name>
+                                       <description>Server thread pool MAIN: normalized load average (1 minute)</description>
                                        <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance>AGENT</instance>
+                                       <instance>MAIN</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -289,16 +257,16 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="131">
-                                       <guid>22ceb0dc-fe66-44c2-9bcf-d2dbad642912</guid>
-                                       <name>Server.ThreadPool.Usage(AGENT)</name>
-                                       <description>Server thread pool AGENT: usage</description>
+                               <dci id="1">
+                                       <guid>6714a626-71d2-4113-956e-876ea7cd8e04</guid>
+                                       <name>Server.ThreadPool.Load(MAIN)</name>
+                                       <description>Server thread pool MAIN: current load</description>
                                        <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance>AGENT</instance>
+                                       <instance></instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -310,15 +278,36 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="132">
-                                       <guid>34da6cd0-917d-4b67-a35a-789ab8a3f0bb</guid>
-                                       <name>Server.ThreadPool.Load(SCHEDULER)</name>
-                                       <description>Server thread pool SCHEDULER: current load</description>
+                               <dci id="2">
+                                       <guid>1fefd164-b840-4ea3-855c-3fcb10ea8d65</guid>
+                                       <name>Server.ThreadPool.CurrSize(MAIN)</name>
+                                       <description>Server thread pool MAIN: current size</description>
                                        <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
+                                       <instance></instance>
+                                       <systemTag></systemTag>
+                                       <delta>0</delta>
+                                       <flags>0</flags>
+                                       <snmpRawValueType>0</snmpRawValueType>
+                                       <snmpPort>0</snmpPort>
+                                       <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
+                                       <transformation></transformation>
+                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
+                                       <instanceDiscoveryData></instanceDiscoveryData>
+                                       <instanceFilter></instanceFilter>
+                               </dci>
+                               <dci id="15">
+                                       <guid>3cc06a71-bf9c-476e-b392-dc4d672b33e4</guid>
+                                       <name>Server.ThreadPool.LoadAverage(SCHEDULER,1)</name>
+                                       <description>Server thread pool SCHEDULER: normalized load average (1 minute)</description>
+                                       <dataType>5</dataType>
+                                       <samples>0</samples>
+                                       <origin>0</origin>
+                                       <interval>0</interval>
+                                       <retention>0</retention>
                                        <instance>SCHEDULER</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
@@ -327,11 +316,23 @@
                                        <snmpPort>0</snmpPort>
                                        <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
                                        <transformation></transformation>
+                                       <thresholds>
+                                               <threshold id="1">
+                                                       <function>0</function>
+                                                       <condition>4</condition>
+                                                       <value>1</value>
+                                                       <activationEvent>DC_SERVER_THREAD_POOL_TOO_BUSY</activationEvent>
+                                                       <deactivationEvent>SYS_THRESHOLD_REARMED</deactivationEvent>
+                                                       <sampleCount>5</sampleCount>
+                                                       <repeatInterval>-1</repeatInterval>
+                                                       <script></script>
+                                               </threshold>
+                                       </thresholds>
                                        <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="133">
+                               <dci id="14">
                                        <guid>fe30414f-b23a-4c97-8a74-6bd0bb4c3019</guid>
                                        <name>Server.ThreadPool.CurrSize(SCHEDULER)</name>
                                        <description>Server thread pool SCHEDULER: current size</description>
@@ -352,11 +353,11 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="134">
-                                       <guid>3cc06a71-bf9c-476e-b392-dc4d672b33e4</guid>
-                                       <name>Server.ThreadPool.LoadAverage(SCHEDULER)</name>
-                                       <description>Server thread pool SCHEDULER: load average (1 minute)</description>
-                                       <dataType>5</dataType>
+                               <dci id="13">
+                                       <guid>34da6cd0-917d-4b67-a35a-789ab8a3f0bb</guid>
+                                       <name>Server.ThreadPool.Load(SCHEDULER)</name>
+                                       <description>Server thread pool SCHEDULER: current load</description>
+                                       <dataType>0</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
@@ -369,32 +370,20 @@
                                        <snmpPort>0</snmpPort>
                                        <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
                                        <transformation></transformation>
-                                       <thresholds>
-                                               <threshold id="1">
-                                                       <function>0</function>
-                                                       <condition>4</condition>
-                                                       <value>1</value>
-                                                       <activationEvent>DC_SERVER_THREAD_POOL_TOO_BUSY</activationEvent>
-                                                       <deactivationEvent>SYS_THRESHOLD_REARMED</deactivationEvent>
-                                                       <sampleCount>5</sampleCount>
-                                                       <repeatInterval>-1</repeatInterval>
-                                                       <script></script>
-                                               </threshold>
-                                       </thresholds>
                                        <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="135">
-                                       <guid>0112f75b-b98f-40fb-ba30-8422538d6174</guid>
-                                       <name>Server.ThreadPool.Usage(SCHEDULER)</name>
-                                       <description>Server thread pool SCHEDULER: usage</description>
-                                       <dataType>0</dataType>
+                               <dci id="7">
+                                       <guid>06a8d7f2-ad9c-490e-b3a2-032e936c8f87</guid>
+                                       <name>Server.ThreadPool.LoadAverage(POLLERS,1)</name>
+                                       <description>Server thread pool POLLERS: normalized load average (1 minute)</description>
+                                       <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance>SCHEDULER</instance>
+                                       <instance>POLLERS</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -402,6 +391,18 @@
                                        <snmpPort>0</snmpPort>
                                        <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
                                        <transformation></transformation>
+                                       <thresholds>
+                                               <threshold id="1">
+                                                       <function>0</function>
+                                                       <condition>4</condition>
+                                                       <value>1</value>
+                                                       <activationEvent>DC_SERVER_THREAD_POOL_TOO_BUSY</activationEvent>
+                                                       <deactivationEvent>SYS_THRESHOLD_REARMED</deactivationEvent>
+                                                       <sampleCount>5</sampleCount>
+                                                       <repeatInterval>-1</repeatInterval>
+                                                       <script></script>
+                                               </threshold>
+                                       </thresholds>
                                        <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
@@ -409,7 +410,7 @@
                        </dataCollection>
                        <filter>return $node-&gt;isLocalMgmt;</filter>
                </template>
-               <template id="159">
+               <template id="103">
                        <guid>3677cb73-d121-4d48-b529-37a276f592be</guid>
                        <name>Database writer</name>
                        <flags>3</flags>
@@ -418,10 +419,10 @@
                                <element id="2">NetXMS Server</element>
                        </path>
                        <dataCollection>
-                               <dci id="12">
+                               <dci id="17">
                                        <guid>0016a2a8-e08b-4730-8506-6f587114d872</guid>
                                        <name>Server.AverageDBWriterQueueSize.IData</name>
-                                       <description>Database writer&apos;s request queue (DCI data) for last minute</description>
+                                       <description>NetXMS server: satabase writer&apos;s request queue (DCI data)</description>
                                        <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
@@ -439,10 +440,10 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="13">
+                               <dci id="18">
                                        <guid>7cebaa83-89e1-476d-bbae-8c371f30aec8</guid>
                                        <name>Server.AverageDBWriterQueueSize.Other</name>
-                                       <description>Database writer&apos;s request queue (other queries) for last minute</description>
+                                       <description>NetXMS server: database writer&apos;s request queue (other queries)</description>
                                        <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
@@ -460,10 +461,10 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="14">
+                               <dci id="19">
                                        <guid>ff31b82b-0dac-49da-bbd9-42205bc325d0</guid>
                                        <name>Server.AverageDBWriterQueueSize</name>
-                                       <description>Database writer&apos;s request queue for last minute</description>
+                                       <description>NetXMS server: database writer&apos;s request queue</description>
                                        <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
@@ -484,25 +485,26 @@
                        </dataCollection>
                        <filter>return $node-&gt;isLocalMgmt;</filter>
                </template>
-               <template id="162">
-                       <guid>22a93d86-a72b-47e7-8178-0040548a3a47</guid>
-                       <name>Server Performance</name>
+               <template id="106">
+                       <guid>d00799c6-4dc3-4f4e-8d67-b7e0714ff4f5</guid>
+                       <name>Windows</name>
                        <flags>3</flags>
                        <path>
                                <element id="1">System</element>
                                <element id="2">NetXMS Server</element>
+                               <element id="3">Memory usage</element>
                        </path>
                        <dataCollection>
-                               <dci id="17">
-                                       <guid>8e52fd9f-d7e6-4cfe-a0db-8671e7ee1bc7</guid>
-                                       <name>Server.AverageDCIQueuingTime</name>
-                                       <description>Average time to queue DCI for polling for last minute</description>
-                                       <dataType>1</dataType>
+                               <dci id="28">
+                                       <guid>ac599231-aef9-46e7-9b59-a8e5716f6ba1</guid>
+                                       <name>Process.WkSet(&quot;netxmsd.exe&quot;)</name>
+                                       <description>NetXMS server: physical memory used by process</description>
+                                       <dataType>2</dataType>
                                        <samples>0</samples>
-                                       <origin>0</origin>
+                                       <origin>1</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance></instance>
+                                       <instance>netxmsd.exe</instance>
                                        <systemTag></systemTag>
                                        <delta>0</delta>
                                        <flags>0</flags>
@@ -514,10 +516,56 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="18">
+                       </dataCollection>
+                       <filter>return $node-&gt;isLocalMgmt &amp;&amp; ($node-&gt;platformName like &quot;windows-*&quot;);</filter>
+               </template>
+               <template id="107">
+                       <guid>2b34394a-bef7-4cec-9cb6-70de8c6b7ed6</guid>
+                       <name>UNIX</name>
+                       <flags>3</flags>
+                       <path>
+                               <element id="1">System</element>
+                               <element id="2">NetXMS Server</element>
+                               <element id="3">Memory usage</element>
+                       </path>
+                       <dataCollection>
+                               <dci id="29">
+                                       <guid>d2f78d83-8820-42ef-bcd4-ed6729d4b7f7</guid>
+                                       <name>Process.WkSet(&quot;netxmsd&quot;)</name>
+                                       <description>NetXMS server: physical memory used by process</description>
+                                       <dataType>2</dataType>
+                                       <samples>0</samples>
+                                       <origin>1</origin>
+                                       <interval>0</interval>
+                                       <retention>0</retention>
+                                       <instance>netxmsd</instance>
+                                       <systemTag></systemTag>
+                                       <delta>0</delta>
+                                       <flags>0</flags>
+                                       <snmpRawValueType>0</snmpRawValueType>
+                                       <snmpPort>0</snmpPort>
+                                       <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
+                                       <transformation></transformation>
+                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
+                                       <instanceDiscoveryData></instanceDiscoveryData>
+                                       <instanceFilter></instanceFilter>
+                               </dci>
+                       </dataCollection>
+                       <filter>return $node-&gt;isLocalMgmt &amp;&amp; !($node-&gt;platformName like &quot;windows-*&quot;);</filter>
+               </template>
+               <template id="104">
+                       <guid>22a93d86-a72b-47e7-8178-0040548a3a47</guid>
+                       <name>Server Performance</name>
+                       <flags>3</flags>
+                       <path>
+                               <element id="1">System</element>
+                               <element id="2">NetXMS Server</element>
+                       </path>
+                       <dataCollection>
+                               <dci id="21">
                                        <guid>2588c71e-271c-4b74-86ea-c0043671d9c0</guid>
                                        <name>Server.AverageDCPollerQueueSize</name>
-                                       <description>Data collection poller&apos;s request queue for last minute</description>
+                                       <description>NetXMS server: data collection poller&apos;s request queue</description>
                                        <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
@@ -535,7 +583,7 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="19">
+                               <dci id="22">
                                        <guid>3ecedaff-f323-4d21-805b-28759dae53e6</guid>
                                        <name>Server.TotalEventsProcessed</name>
                                        <description>NetXMS server: events processed for last minute</description>
@@ -556,10 +604,10 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="20">
+                               <dci id="23">
                                        <guid>a7483837-7308-4063-aa4d-de9401fd9516</guid>
                                        <name>Server.AverageSyslogProcessingQueueSize</name>
-                                       <description>NetXMS server: syslog processing queue for last minute</description>
+                                       <description>NetXMS server: syslog processing queue</description>
                                        <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
@@ -577,11 +625,11 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="21">
-                                       <guid>21e751fd-3742-41f4-b61d-081aa21c6604</guid>
-                                       <name>Server.AverageSyslogWriterQueueSize</name>
-                                       <description>NetXMS server: syslog writer queue for last minute</description>
-                                       <dataType>5</dataType>
+                               <dci id="20">
+                                       <guid>8e52fd9f-d7e6-4cfe-a0db-8671e7ee1bc7</guid>
+                                       <name>Server.AverageDCIQueuingTime</name>
+                                       <description>NetXMS server: average time to queue DCI for polling</description>
+                                       <dataType>1</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
@@ -598,28 +646,28 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="209">
-                                       <guid>0c5a4ba7-f16d-4a8c-8ba0-c490eec1632b</guid>
-                                       <name>Server.DB.Queries.Total</name>
-                                       <description>NetXMS server: DB queries per minute</description>
-                                       <dataType>3</dataType>
+                               <dci id="24">
+                                       <guid>21e751fd-3742-41f4-b61d-081aa21c6604</guid>
+                                       <name>Server.AverageSyslogWriterQueueSize</name>
+                                       <description>NetXMS server: syslog writer queue</description>
+                                       <dataType>5</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
                                        <instance></instance>
                                        <systemTag></systemTag>
-                                       <delta>3</delta>
+                                       <delta>0</delta>
                                        <flags>0</flags>
                                        <snmpRawValueType>0</snmpRawValueType>
                                        <snmpPort>0</snmpPort>
                                        <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
                                        <transformation></transformation>
-                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;true&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;16748574&lt;/color&gt;&#x0A;   &lt;title&gt;Database Queries&lt;/title&gt;&#x0A;   &lt;name&gt;Queries&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
+                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="210">
+                               <dci id="26">
                                        <guid>c21bff7e-2a8c-47db-9270-80e577d5b1d1</guid>
                                        <name>Server.DB.Queries.Select</name>
                                        <description>NetXMS server: DB SELECT queries per minute</description>
@@ -640,10 +688,10 @@
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                               <dci id="211">
-                                       <guid>c3e938b2-2b43-4509-94f9-0f42c1c234a4</guid>
-                                       <name>Server.DB.Queries.NonSelect</name>
-                                       <description>NetXMS server: DB non-SELECT queries per minute</description>
+                               <dci id="25">
+                                       <guid>0c5a4ba7-f16d-4a8c-8ba0-c490eec1632b</guid>
+                                       <name>Server.DB.Queries.Total</name>
+                                       <description>NetXMS server: DB queries per minute</description>
                                        <dataType>3</dataType>
                                        <samples>0</samples>
                                        <origin>0</origin>
@@ -657,80 +705,33 @@
                                        <snmpPort>0</snmpPort>
                                        <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
                                        <transformation></transformation>
-                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;42495&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;non-SELECT queries&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;209&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
-                                       <instanceDiscoveryData></instanceDiscoveryData>
-                                       <instanceFilter></instanceFilter>
-                               </dci>
-                       </dataCollection>
-                       <filter>return $node-&gt;isLocalMgmt;</filter>
-               </template>
-               <template id="182">
-                       <guid>d00799c6-4dc3-4f4e-8d67-b7e0714ff4f5</guid>
-                       <name>Windows</name>
-                       <flags>3</flags>
-                       <path>
-                               <element id="1">System</element>
-                               <element id="2">NetXMS Server</element>
-                               <element id="3">Memory usage</element>
-                       </path>
-                       <dataCollection>
-                               <dci id="115">
-                                       <guid>ac599231-aef9-46e7-9b59-a8e5716f6ba1</guid>
-                                       <name>Process.WkSet(&quot;netxmsd.exe&quot;)</name>
-                                       <description>NetXMS server: physical memory used by process</description>
-                                       <dataType>2</dataType>
-                                       <samples>0</samples>
-                                       <origin>1</origin>
-                                       <interval>0</interval>
-                                       <retention>0</retention>
-                                       <instance>netxmsd.exe</instance>
-                                       <systemTag></systemTag>
-                                       <delta>0</delta>
-                                       <flags>0</flags>
-                                       <snmpRawValueType>0</snmpRawValueType>
-                                       <snmpPort>0</snmpPort>
-                                       <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
-                                       <transformation></transformation>
-                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
+                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;true&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;16748574&lt;/color&gt;&#x0A;   &lt;title&gt;Database Queries&lt;/title&gt;&#x0A;   &lt;name&gt;Queries&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
-                       </dataCollection>
-                       <filter>return $node-&gt;isLocalMgmt &amp;&amp; ($node-&gt;platformName like &quot;windows-*&quot;);</filter>
-               </template>
-               <template id="183">
-                       <guid>2b34394a-bef7-4cec-9cb6-70de8c6b7ed6</guid>
-                       <name>UNIX</name>
-                       <flags>3</flags>
-                       <path>
-                               <element id="1">System</element>
-                               <element id="2">NetXMS Server</element>
-                               <element id="3">Memory usage</element>
-                       </path>
-                       <dataCollection>
-                               <dci id="116">
-                                       <guid>d2f78d83-8820-42ef-bcd4-ed6729d4b7f7</guid>
-                                       <name>Process.WkSet(&quot;netxmsd&quot;)</name>
-                                       <description>NetXMS server: physical memory used by process</description>
-                                       <dataType>2</dataType>
+                               <dci id="27">
+                                       <guid>c3e938b2-2b43-4509-94f9-0f42c1c234a4</guid>
+                                       <name>Server.DB.Queries.NonSelect</name>
+                                       <description>NetXMS server: DB non-SELECT queries per minute</description>
+                                       <dataType>3</dataType>
                                        <samples>0</samples>
-                                       <origin>1</origin>
+                                       <origin>0</origin>
                                        <interval>0</interval>
                                        <retention>0</retention>
-                                       <instance>netxmsd</instance>
+                                       <instance></instance>
                                        <systemTag></systemTag>
-                                       <delta>0</delta>
+                                       <delta>3</delta>
                                        <flags>0</flags>
                                        <snmpRawValueType>0</snmpRawValueType>
                                        <snmpPort>0</snmpPort>
                                        <instanceDiscoveryMethod>0</instanceDiscoveryMethod>
                                        <transformation></transformation>
-                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;49152&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;0&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
+                                       <perfTabSettings>&lt;config&gt;&#x0A;   &lt;enabled&gt;false&lt;/enabled&gt;&#x0A;   &lt;autoScale&gt;true&lt;/autoScale&gt;&#x0A;   &lt;logScaleEnabled&gt;false&lt;/logScaleEnabled&gt;&#x0A;   &lt;minYScaleValue&gt;1&lt;/minYScaleValue&gt;&#x0A;   &lt;maxYScaleValue&gt;100&lt;/maxYScaleValue&gt;&#x0A;   &lt;timeRange&gt;1&lt;/timeRange&gt;&#x0A;   &lt;timeUnits&gt;1&lt;/timeUnits&gt;&#x0A;   &lt;type&gt;0&lt;/type&gt;&#x0A;   &lt;color&gt;42495&lt;/color&gt;&#x0A;   &lt;title&gt;&lt;/title&gt;&#x0A;   &lt;name&gt;non-SELECT queries&lt;/name&gt;&#x0A;   &lt;showThresholds&gt;false&lt;/showThresholds&gt;&#x0A;   &lt;parentDciId&gt;209&lt;/parentDciId&gt;&#x0A;   &lt;order&gt;100&lt;/order&gt;&#x0A;&lt;/config&gt;</perfTabSettings>
                                        <instanceDiscoveryData></instanceDiscoveryData>
                                        <instanceFilter></instanceFilter>
                                </dci>
                        </dataCollection>
-                       <filter>return $node-&gt;isLocalMgmt &amp;&amp; !($node-&gt;platformName like &quot;windows-*&quot;);</filter>
+                       <filter>return $node-&gt;isLocalMgmt;</filter>
                </template>
        </templates>
        <traps>

diff --git a/include/nms_agent.h b/include/nms_agent.h
index 23a1e5b..f68f22f 100644 (file)
--- a/include/nms_agent.h
+++ b/include/nms_agent.h
@@ -615,12 +615,12 @@ inline void ret_uint(TCHAR *rbuf, UINT32 value)
 #endif
 }
 
-inline void ret_double(TCHAR *rbuf, double value)
+inline void ret_double(TCHAR *rbuf, double value, int digits = 6)
 {
 #if defined(_WIN32) && (_MSC_VER >= 1300)
-   _sntprintf_s(rbuf, MAX_RESULT_LENGTH, _TRUNCATE, _T("%f"), value);
+   _sntprintf_s(rbuf, MAX_RESULT_LENGTH, _TRUNCATE, _T("%1.*f"), digits, value);
 #else
-   _sntprintf(rbuf, MAX_RESULT_LENGTH, _T("%f"), value);
+   _sntprintf(rbuf, MAX_RESULT_LENGTH, _T("%1.*f"), digits, value);
 #endif
 }
 

diff --git a/src/libnetxms/tp.cpp b/src/libnetxms/tp.cpp
index 4c1ebc3..0850fc3 100644 (file)
--- a/src/libnetxms/tp.cpp
+++ b/src/libnetxms/tp.cpp
@@ -1,7 +1,7 @@
 /* 
 ** NetXMS - Network Management System
 ** NetXMS Foundation Library
-** Copyright (C) 2003-2015 Victor Kirhenshtein
+** Copyright (C) 2003-2016 Victor Kirhenshtein
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published

diff --git a/src/server/core/debug.cpp b/src/server/core/debug.cpp
index 8a099be..ddbdf12 100644 (file)
--- a/src/server/core/debug.cpp
+++ b/src/server/core/debug.cpp
@@ -206,8 +206,9 @@ void ShowThreadPool(CONSOLE_CTX console, ThreadPool *p)
  */
 LONG GetThreadPoolStat(ThreadPoolStat stat, const TCHAR *param, TCHAR *value)
 {
-   TCHAR poolName[64];
-   if (!AgentGetParameterArg(param, 1, poolName, 64))
+   TCHAR poolName[64], options[64];
+   if (!AgentGetParameterArg(param, 1, poolName, 64) ||
+       !AgentGetParameterArg(param, 2, options, 64))
       return SYSINFO_RC_UNSUPPORTED;
 
    ThreadPoolInfo info;
@@ -223,13 +224,22 @@ LONG GetThreadPoolStat(ThreadPoolStat stat, const TCHAR *param, TCHAR *value)
          ret_int(value, info.load);
          break;
       case THREAD_POOL_LOADAVG_1:
-         ret_double(value, info.loadAvg[0]);
+         if ((options[0] != 0) && _tcstol(options, NULL, 10))
+            ret_double(value, info.loadAvg[0] / info.maxThreads, 2);
+         else
+            ret_double(value, info.loadAvg[0], 2);
          break;
       case THREAD_POOL_LOADAVG_5:
-         ret_double(value, info.loadAvg[1]);
+         if ((options[0] != 0) && _tcstol(options, NULL, 10))
+            ret_double(value, info.loadAvg[1] / info.maxThreads, 2);
+         else
+            ret_double(value, info.loadAvg[1], 2);
          break;
       case THREAD_POOL_LOADAVG_15:
-         ret_double(value, info.loadAvg[2]);
+         if ((options[0] != 0) && _tcstol(options, NULL, 10))
+            ret_double(value, info.loadAvg[2] / info.maxThreads, 2);
+         else
+            ret_double(value, info.loadAvg[2], 2);
          break;
       case THREAD_POOL_MAX_SIZE:
          ret_int(value, info.maxThreads);