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

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
@guilhemmarchand
guilhemmarchand committed Aug 22, 2016
2 parents fc92d5e + 76c884a commit 64cdba4
Show file tree
Hide file tree
Showing 118 changed files with 2,578 additions and 2,462 deletions.
10 changes: 7 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,18 @@ limitations under the License.

#### This application is also officially available on Splunk Base:

https://splunkbase.splunk.com/app/1753/
https://splunkbase.splunk.com/app/1753

#### The documentation for Nmon Performance Monitor is available online at:

http://nmonsplunk.wikidot.com
http://nmon-for-splunk.readthedocs.io

#### Video available in the Nmon Performance app youtube channel:
https://www.youtube.com/channel/UCGWHd40x0A7wjk8qskyHQcQ

#### To get support:

http://nmonsplunk.wikidot.com/about-support
http://nmon-for-splunk.readthedocs.io/en/latest/support.html

#### NMON is short for Nigel's Performance Monitor and is available on AIX, Solaris (With Sarmon), Linux and ARM Systems.

Expand All @@ -37,6 +40,7 @@ http://nmonsplunk.wikidot.com/about-support

#### NMON Performance does Global / Summary Analysis per Host, Analysis per type of metric (CPU usage, Memory, I/O...), Predictive, Comparison Analysis, Inventory Collect and Analysis, and more.

**Link to the last main release youtube video presentation:** https://www.youtube.com/watch?v=yHlo0idH3is

![screen1](./docs/img/screen001.png)

Expand Down
13 changes: 11 additions & 2 deletions appserver/static/components/scc_takethetour/scc_takethetour.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ define(function(require, exports, module) {
no_more_label: "Do not show this tour again",
hide_container: false,
show_credits: false,
cookie_name_suffix: ""
cookie_name_suffix: "",
backdrop_close: true,
keyboard_close: true
},

initialize: function() {
Expand Down Expand Up @@ -186,6 +188,10 @@ define(function(require, exports, module) {
isScrollNeeded();
});

// Treat "backdrop_close" and "keyboard_close" settings
var modal_backdrop = this.settings.get('backdrop_close') === true ? true : 'static';
var modal_keyboard = this.settings.get('keyboard_close') === true ? true : false;

$modal
.on('shown.bs.modal', function(e){
// Prevents page body scrolling if modal content is scrollable
Expand All @@ -201,7 +207,10 @@ define(function(require, exports, module) {
setCookie(ck_name);
}
})
.modal('show');
.modal({
backdrop: modal_backdrop,
keyboard: modal_keyboard
});
}

return this;
Expand Down
Binary file added appserver/static/icons/grey_theme/dollar.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions appserver/static/panel_decoration.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,10 @@
padding: 7px 55px 7px 38px !important;
margin-left: 3px !important;
}

[id^=cost] h2.panel-title {
background: url('icons/grey_theme/dollar.png') no-repeat center left;
background-size: 30px 30px;
padding: 7px 55px 7px 38px !important;
margin-left: 3px !important;
}
Binary file added appserver/static/take_the_tour/total_cost_of_ownership.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed appserver/static/various/nmonwiki_screenshot.png
View file
Binary file not shown.
Binary file added appserver/static/various/online_doc.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion default/app.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ label = NMON Performance
[launcher]
author = Guilhem Marchand
description = Splunk for NMON Performance provides an Enterprise class Application to exploit NMON Performance Monitor Data on AIX, Solaris and Linux Systems
version = 1.7.4
version = 1.7.5

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
36 changes: 36 additions & 0 deletions default/data/models/NMON_Processing_Data_Collect.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,30 @@
"displayName": "Version of Perl",
"comment": ""
},
{
"fieldName": "addon_type",
"owner": "NMON_Processing",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "addon_type",
"comment": ""
},
{
"fieldName": "addon_version",
"owner": "NMON_Processing",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "addon_version",
"comment": ""
},
{
"fieldName": "_time",
"owner": "BaseEvent",
Expand Down Expand Up @@ -555,6 +579,18 @@
"displayName": "Version of Perl",
"comment": ""
},
{
"fieldName": "addon_type",
"owner": "NMON_Processing",
"type": "string",
"fieldSearch": "",
"required": false,
"multivalue": false,
"hidden": false,
"editable": true,
"displayName": "addon_type",
"comment": ""
},
{
"fieldName": "_time",
"owner": "BaseEvent",
Expand Down

0 comments on commit 64cdba4

Please sign in to comment.