diff --git a/README.md b/README.md index 5b60a67..ae4b392 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,15 @@ System-Level Monitoring for AIX, Linux, OSX/MacOS & Solaris/SunOS * [Contributing](#Contributing) * [Requirements](#requirements) * [Supported OSes](#supported-oses) -* [Installation & Usage Overview](#installation-usage-overview) +* [Installation & Usage Overview](#installation--usage-overview) * [`plugin.json` configuration](#pluginjson-configuration) * [Global settings](#global-settings) - * [Using the EU Data Center? Click here!](#eu-data-center) + * [Using the EU Data Center? Click here!](#global-settings) * [Agent settings](#agent-settings) * [Proxy settings](#proxy-settings) * [Dashboard deployment](#dashboard-deployment) * [Other configurations](#other-configurations) - * [Deploying Dashboards from separate server/desktop](#deploying-dashboards-from-separate-serverdesktop) + * [Deploying Dashboards from separate server or desktop](#deploying-dashboards-from-separate-server-or-desktop) * [Fix for using the WebSphere JDK](#fix-for-using-the-websphere-jdk) * [Enabling Debug Mode](#debug-mode) @@ -70,7 +70,7 @@ _Note: A full example of the possible fields in `plugin.json` can be found in `p ### Agent settings These settings are found in the `agents` object. -* `name`: If set to `auto`, the plugin will use that server's hostname. Otherwise, sets the hostname and agentName to whatever is set here. +* `name`: If set to `auto`, the plugin will use that server's hostname. Otherwise, sets the hostname and agentName to whatever is set here. * `static` (optional): An object containing static attributes (as name-value pairs) you want to appear in every event from this plugin. For example: ```json "agents": [ @@ -79,7 +79,7 @@ These settings are found in the `agents` object. "static": { "data_center": "Philadelphia", "customer": "Eagles", - "rank": 1 + "rank": 1 } } ] @@ -109,7 +109,7 @@ If you don't want the dashboard deployment to run at startup, leave `admin_api_k ## Other configurations -### Deploying Dashboards from separate server/desktop +### Deploying Dashboards from separate server or desktop If you want to initiate the dashboard install from a standalone machine (i.e. a tools server or your own mac, linux or cygwin laptop/desktop), you will need the following: * `pluginctl.sh` @@ -159,4 +159,3 @@ Note: You will need to restart the Unix Monitor to pick up these changes. 1. Remove `"debug": true` from `config/plugin.json` or change to `"debug": false` 2. Replace `config/logback.xml` with `config/logback-info.xml` 3. Restart Unix Monitor - diff --git a/config/logback-debug.xml b/config/logback-debug.xml index 00c5756..d4a65d0 100644 --- a/config/logback-debug.xml +++ b/config/logback-debug.xml @@ -27,7 +27,7 @@ 10MB - + diff --git a/config/logback-info.xml b/config/logback-info.xml index 9cf7bcc..39e7fa1 100644 --- a/config/logback-info.xml +++ b/config/logback-info.xml @@ -27,10 +27,7 @@ 10MB - - - - + diff --git a/config/logback.xml b/config/logback.xml index 9cf7bcc..39e7fa1 100644 --- a/config/logback.xml +++ b/config/logback.xml @@ -27,10 +27,7 @@ 10MB - - - - + diff --git a/pom.xml b/pom.xml index a121505..e16aa48 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.newrelic.experts newrelic-unix-monitor - 0.1.6 + 0.1.7 newrelic-unix-monitor @@ -67,7 +67,7 @@ com.newrelic.experts infra_publish - 2.2.2 + 2.2.8 ch.qos.logback diff --git a/src/main/java/com/newrelic/infra/unix/UnixAgent.java b/src/main/java/com/newrelic/infra/unix/UnixAgent.java index 4578083..a134850 100644 --- a/src/main/java/com/newrelic/infra/unix/UnixAgent.java +++ b/src/main/java/com/newrelic/infra/unix/UnixAgent.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -23,7 +22,7 @@ public class UnixAgent extends Agent { private HashSet disks; private HashSet networkInterfaces; private int pageSize; - private Map commandTimestamp; + private HashMap commandTimestamp; public UnixAgent(AgentSettings asettings) { agentSettings = asettings; @@ -31,7 +30,7 @@ public UnixAgent(AgentSettings asettings) { networkInterfaces = getMembers(agentSettings.getOsSettings().getInterfacesCommand(), agentSettings.getOsSettings().getInterfacesRegex()); setPageSize(agentSettings); addStaticAttribute(UnixAgentConstants.KAOSMetricName, agentSettings.getOs().split("_")[0]); - commandTimestamp = new HashMap(); + commandTimestamp = new HashMap(); } // Maintain timestamp for when the command was run last.