Skip to content

Commit 2b57324

Browse files
MakarovS96MakarovS96
committed
[FIX] fix license limit count.
1 parent 42674ec commit 2b57324

File tree

3 files changed

+32
-5
lines changed

3 files changed

+32
-5
lines changed

‎cls/kutac/monitor/cubes/HistorySysData.cls.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ Cube definition from Architect.</Description>
6060
</measure>
6161
<measure name="SysProcesses" disabled="false" sourceProperty="SysProcesses" aggregate="AVG" type="integer" hidden="false" searchable="false">
6262
</measure>
63-
<calculatedMember name="Sys_LicUsedLocal" displayName="License Used Local" disabled="false" dimension="Measures" valueExpression="%KPI(&quot;CurrSysData&quot;,&quot;SysLicUsedLocal&quot;,1)" hidden="false">
63+
<calculatedMember name="Sys_LicUsedLocal" displayName="License Limit" disabled="false" dimension="Measures" valueExpression="%KPI(&quot;CurrSysData&quot;,&quot;SysLicUsedLocal&quot;,1)" hidden="false">
6464
</calculatedMember>
65-
<calculatedMember name="Sys_LicUsedDist" displayName="License Used Dist." disabled="false" dimension="Measures" valueExpression="%KPI(&quot;CurrSysData&quot;,&quot;SysLicUsedDist&quot;,1)" hidden="false">
65+
<calculatedMember name="Sys_LicUsedDist" displayName="License Used Now" disabled="false" dimension="Measures" valueExpression="%KPI(&quot;CurrSysData&quot;,&quot;SysLicUsedDist&quot;,1)" hidden="false">
6666
</calculatedMember>
6767
<calculatedMember name="Sys_CPUUser" displayName="CPU User" disabled="false" dimension="Measures" valueExpression="%KPI(&quot;CurrSysData&quot;,&quot;SysCPUUser&quot;,1)" hidden="false">
6868
</calculatedMember>

‎cls/kutac/monitor/current/SysData.cls.xml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This XData definition defines the KPI.</Description>
1717
<XMLNamespace>http://www.intersystems.com/deepsee/kpi</XMLNamespace>
1818
<Data><![CDATA[
1919
<kpi xmlns="http://www.intersystems.com/deepsee/kpi"
20-
name="CurrSysData" sourceType="sql"
20+
name="CurrSysData" sourceType="manual"
2121
caption="Current System Data"
2222
>
2323
<property columnNo="1" name="ID" />
@@ -46,7 +46,7 @@ Return an SQL statement to execute.</Description>
4646
<FormalSpec><![CDATA[&pSQL:%String]]></FormalSpec>
4747
<ReturnType>%Status</ReturnType>
4848
<Implementation><![CDATA[
49-
set pSQL = "SELECT top 1 ID, DateTime, Sys_CPUIdle, Sys_CPUKernel, Sys_CPUUser, Sys_LicUsedDist, Sys_LicUsedLocal "_
49+
set pSQL = "SELECT top 1 ID, DateTime, Sys_CPUIdle, Sys_CPUKernel, Sys_CPUUser, Sys_LicUsedDist "_
5050
"FROM SYS_History.SysData order by DateTime Desc"
5151
Quit $$$OK
5252
]]></Implementation>
@@ -65,5 +65,32 @@ This callback is invoked from a dashboard when an action defined by this dashboa
6565
Quit $$$OK
6666
]]></Implementation>
6767
</Method>
68+
69+
<Method name="%OnExecute">
70+
<Description>
71+
Get data for this KPI manually.
72+
This is implemented by subclasses that provide manual data.</Description>
73+
<ReturnType>%Status</ReturnType>
74+
<Implementation><![CDATA[
75+
Set tSC = $$$OK
76+
Try {
77+
&sql(SELECT top 1 ID, DateTime, Sys_CPUIdle, Sys_CPUKernel, Sys_CPUUser, Sys_LicUsedDist
78+
INTO :ID, :DateTime, :SysCPUIdle, :SysCPUKernel, :SysCPUUser, :SysLicUsedDist
79+
FROM SYS_History.SysData
80+
ORDER BY DateTime DESC)
81+
set ..%data(1,"ID") = ID
82+
set ..%data(1,"DateTime") = DateTime
83+
set ..%data(1,"SysCPUIdle") = SysCPUIdle
84+
set ..%data(1,"SysCPUKernel") = SysCPUKernel
85+
set ..%data(1,"SysCPUUser") = SysCPUUser
86+
set ..%data(1,"SysLicUsedDist") = SysLicUsedDist
87+
set ..%data(1,"SysLicUsedLocal") = $system.License.GetUserLimit()
88+
}
89+
Catch(ex) {
90+
Set tSC = ex.AsStatus()
91+
}
92+
Quit tSC
93+
]]></Implementation>
94+
</Method>
6895
</Class>
6996
</Export>

‎cls/kutac/monitor/utils/Installer.cls.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ do ##class(kutac.monitor.utils.Installer).setup(.pVars)</Description>
594594

595595
<XData name="DSWSettings">
596596
<MimeType>text/plain</MimeType>
597-
<Data><![CDATA[{"Default":{"addons":"","app":{"language":"en","hideFolders":false,"showImages":true,"isMetro":false},"namespaces":{"tiles":{"":{"":{"row":0,"col":0,"sizeX":1,"sizeY":1,"color":2,"fontColor":0,"icon":27,"title":""},"CPU Utilization":{"row":0,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":1,"title":"CPU Utilization"},"Database Sizes":{"row":0,"col":2,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":1,"title":"Database Sizes"},"Globals Performance":{"row":0,"col":3,"sizeX":3,"sizeY":3,"color":1,"fontColor":0,"icon":1,"widget":1,"title":"Globals Performance"},"Journal size history":{"row":3,"col":4,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":1,"title":"Journal size history"},"LicenseHistory":{"row":3,"col":5,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":1,"title":"LicenseHistory"},"Object Performance":{"row":0,"col":6,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":1,"title":"Object Performance"},"Routines Performance History":{"row":0,"col":7,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":1,"title":"Routines Performance History"},"Various System Parameters Performance":{"row":0,"col":8,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":1,"title":"Various System Parameters Performance"},"WIJ Performance":{"row":0,"col":9,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":1,"title":"WIJ Performance"}},"mobile/":{"":{"row":0,"col":0,"sizeX":1,"sizeY":1,"color":2,"fontColor":0,"icon":27,"title":""},"CPU Utilization":{"row":0,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"CPU Utilization"},"Database Sizes":{"row":0,"col":2,"sizeX":4,"sizeY":3,"color":1,"fontColor":0,"icon":0,"widget":1,"title":"Database Sizes"},"Globals Performance":{"row":2,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"Globals Performance"},"Journal size history":{"row":1,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"Journal size history"},"LicenseHistory":{"row":0,"col":9,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"LicenseHistory"},"Object Performance":{"row":0,"col":6,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"Object Performance"},"Routines Performance History":{"row":0,"col":8,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"Routines Performance History"},"Various System Parameters Performance":{"row":1,"col":6,"sizeX":4,"sizeY":2,"color":1,"fontColor":0,"icon":0,"title":"Various System Parameters Performance","widget":0},"WIJ Performance":{"row":0,"col":7,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"WIJ Performance"}}},"widgets":{"mobile/DBSizes.dashboard":{"w2":{"isLegend":true,"showValues":false,"isTop":false,"showZero":false,"sizeY":5,"sizeX":5}}}}}}
597+
<Data><![CDATA[{"Default":{"addons":"","app":{"language":"en","hideFolders":false,"showImages":true,"isMetro":false},"namespaces":{"widgets":{"mobile/Current Performance Indicators.dashboard":{"ObjPerf":{"sizeY":7,"sizeX":3,"col":6},"GlobPerf":{"col":4,"sizeY":5,"sizeX":2}},"mobile/GloPerf.dashboard":{"w2":{"sizeY":5,"sizeX":10}},"dash/actions/State Info.dashboard":{"Widget1":{"col":0}},"mobile/ObjPerf.dashboard":{"_filters":[{"targetProperty":"[Measurement Date].[H1].[Month]","value":"&[NOW]"},{"targetProperty":"[Measurement Date].[H1].[Day]","value":"&[13]"}]},"mobile/DBSizes.dashboard":{"w2":{"series":{}}}},"tiles":{"mobile/":{"":{"row":0,"col":0,"sizeX":1,"sizeY":1,"color":2,"fontColor":0,"icon":27,"title":""},"CPU Utilization":{"row":0,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"CPU Utilization"},"Current Performance Indicators":{"row":3,"col":2,"sizeX":2,"sizeY":2,"color":1,"fontColor":0,"icon":0,"hideTitle":true,"widget":0,"title":"Current Performance Indicators"},"Current Performance Objects":{"row":0,"col":5,"sizeX":3,"sizeY":3,"color":1,"fontColor":0,"icon":0,"widget":1,"title":"Current Performance Objects","hideTitle":true},"Database Sizes":{"row":0,"col":2,"sizeX":3,"sizeY":3,"color":1,"fontColor":0,"icon":0,"widget":1,"title":"Database Sizes"},"Globals Performance":{"row":4,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"Globals Performance"},"Journal size history":{"row":3,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"Journal size history"},"License History":{"row":2,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"License History"},"Object Performance":{"row":1,"col":1,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"Object Performance"},"Routines Performance History":{"row":0,"col":8,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"Routines Performance History"},"Various System Parameters Performance":{"row":3,"col":4,"sizeX":4,"sizeY":2,"color":1,"fontColor":0,"icon":0,"widget":0,"title":"Various System Parameters Performance","hideTitle":true},"WIJ Performance":{"row":0,"col":9,"sizeX":1,"sizeY":1,"color":1,"fontColor":0,"icon":0,"title":"WIJ Performance"},"Current CPU Parameters":{"row":1,"col":8,"sizeX":2,"sizeY":2,"color":1,"fontColor":0,"icon":0,"hideTitle":true,"title":"Current CPU Parameters","widget":0},"Current License Count":{"row":3,"col":8,"sizeX":2,"sizeY":2,"color":1,"fontColor":0,"icon":1,"title":"Current License Count","hideTitle":true,"widget":0}}}}}}
598598
]]></Data>
599599
</XData>
600600
</Class>

0 commit comments

Comments
 (0)