Skip to content
This repository has been archived by the owner on Aug 28, 2021. It is now read-only.

Commit

Permalink
Solaris Issues #52 / #53
Browse files Browse the repository at this point in the history
  • Loading branch information
@guilhemmarchand
guilhemmarchand committed Aug 16, 2016
1 parent d9f8645 commit 76fac27
Showing 1 changed file with 112 additions and 10 deletions.
122 changes: 112 additions & 10 deletions default/data/models/NMON_Config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1219,15 +1219,15 @@
{
"outputFields": [
{
"fieldName": "Solaris_physical_memory_MB",
"fieldName": "Solaris_phy_mem_MB_extract",
"owner": "Nmon_Config",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "Solaris_physical_memory_MB",
"displayName": "Solaris_phy_mem_MB_extract",
"comment": ""
}
],
Expand All @@ -1237,7 +1237,52 @@
"editable": true,
"comment": "",
"calculationType": "Rex",
"expression": "BBB.,.*,prtdiag,\\\"Memory\\s*size:\\s*(?<Solaris_physical_memory_MB>\\d*)\\s*Megabytes\\\""
"expression": "BBB.,.*,prtdiag,\\\"Memory\\s*size:\\s*(?<Solaris_phy_mem_MB_extract>\\d*)\\s*Megabytes\\\""
},
{
"outputFields": [
{
"fieldName": "Solaris_phy_mem_GB_extract",
"owner": "Nmon_Config",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "Solaris_phy_mem_GB_extract",
"comment": ""
}
],
"inputField": "_raw",
"calculationID": "w8z7pbyss9cxk2c90juelv7vi",
"owner": "Nmon_Config",
"editable": true,
"comment": "",
"calculationType": "Rex",
"expression": "BBB.,.*,prtdiag,\\\"Memory\\s*size:\\s*(?<Solaris_phy_mem_GB_extract>\\d*)\\s*GB"
},
{
"outputFields": [
{
"fieldName": "Solaris_physical_memory_MB",
"owner": "Nmon_Config",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "Solaris_physical_memory_MB",
"comment": ""
}
],
"calculationID": "syftxzogd8mjqdhdhhhncdi",
"owner": "Nmon_Config",
"editable": true,
"comment": "",
"calculationType": "Eval",
"expression": "case( OStype == \"Solaris\", case(isnotnull(Solaris_phy_mem_MB_extract), Solaris_phy_mem_MB_extract, isnotnull(Solaris_phy_mem_GB_extract), (Solaris_phy_mem_GB_extract/1024)) )"
},
{
"outputFields": [
Expand Down Expand Up @@ -1311,15 +1356,15 @@
{
"outputFields": [
{
"fieldName": "Solaris_processor",
"fieldName": "Solaris_processor_primary",
"owner": "Nmon_Config",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "Solaris_processor",
"displayName": "Solaris_processor_primary",
"comment": ""
}
],
Expand All @@ -1329,20 +1374,20 @@
"editable": true,
"comment": "",
"calculationType": "Rex",
"expression": "BBB.+,[0-9].+psrinfo\\s\\-pv,\\\"\\s+(?P<Solaris_processor>.+)\\s*\\(.+\\\""
"expression": "BBB.+,[0-9].+psrinfo\\s\\-pv,\\\"\\s+(?P<Solaris_processor_primary>.+)\\s*\\(.+clock.+\\\""
},
{
"outputFields": [
{
"fieldName": "Solaris_processor_clockspeed",
"fieldName": "Solaris_processor_clock_primary",
"owner": "Nmon_Config",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "Solaris_processor_clockspeed",
"displayName": "Solaris_processor_clock_primary",
"comment": ""
}
],
Expand All @@ -1352,7 +1397,64 @@
"editable": true,
"comment": "",
"calculationType": "Rex",
"expression": "BBB.+,[0-9].+psrinfo\\s\\-pv,.+clock\\s(?P<Solaris_processor_clockspeed>.+)\\)\\\""
"expression": "BBB.+,[0-9].+psrinfo\\s\\-pv,.+clock\\s(?P<Solaris_processor_clock_primary>.+)\\)\\\""
},
{
"outputFields": [
{
"fieldName": "Solaris_processor_alt",
"owner": "Nmon_Config",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "Solaris_processor_alt",
"comment": ""
},
{
"fieldName": "Solaris_processor_clock_alt",
"owner": "Nmon_Config",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "Solaris_processor_clock_alt",
"comment": ""
}
],
"inputField": "_raw",
"calculationID": "fqh7xokpt3yjzkum3ccz4u0udi",
"owner": "Nmon_Config",
"editable": true,
"comment": "",
"calculationType": "Rex",
"expression": "BBB.+,[0-9].+prtdiag,\\\"0\\s*(?<Solaris_processor_clock_alt>[\\d|\\.]*\\s*\\w*)\\s*(?P<Solaris_processor_alt>[\\w|-]*)\\s*"
},
{
"outputFields": [
{
"fieldName": "Solaris_processor_clockspeed",
"owner": "Nmon_Config",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "Solaris_processor_clockspeed",
"comment": ""
}
],
"calculationID": "5u6bef2gukczqgy780ta603sor",
"owner": "Nmon_Config",
"editable": true,
"comment": "",
"calculationType": "Eval",
"expression": "case( OStype == \"Solaris\", if(isnotnull(Solaris_processor_clock_primary), Solaris_processor_clock_primary, Solaris_processor_clock_alt) )"
},
{
"outputFields": [
Expand Down Expand Up @@ -1440,7 +1542,7 @@
"editable": true,
"comment": "",
"calculationType": "Eval",
"expression": "case(isnotnull(AIX_processor), AIX_processor, isnotnull(Solaris_processor), Solaris_processor, isnotnull(Linux_processor_lscpu), Linux_processor_lscpu + \" (arch: \" + Linux_arch + \")\" , isnull(Linux_processor_lscpu), Linux_processor_cpuinfo)"
"expression": "case(OStype == \"AIX\", AIX_processor, OStype == \"Solaris\", case(isnotnull(Solaris_processor_primary), Solaris_processor_primary, isnotnull(Solaris_processor_alt), Solaris_processor_alt), OStype == \"Linux\", case(isnotnull(Linux_processor_lscpu), Linux_processor_lscpu + \" (arch: \" + Linux_arch + \")\" , isnull(Linux_processor_lscpu), Linux_processor_cpuinfo) )"
},
{
"outputFields": [
Expand Down

0 comments on commit 76fac27

Please sign in to comment.