NMS-16986: System Check Utility : Basic Collection

features/system-report/src/main/java/org/opennms/systemreport/AbstractSystemReportPlugin.java

@@ -88,6 +88,9 @@ public boolean getOutputsFiles() {
         return false;
     }
 
+    @Override
+    public boolean isVisible() { return false; }
+
     protected ResourceLocator getResourceLocator() {
         return m_resourceLocator;
     }
@@ -143,9 +146,8 @@ protected String slurpCommand(final String[] command) {
             is = p.getInputStream();
             isr = new InputStreamReader(is);
             br = new BufferedReader(isr);
-            while (br.ready()) {
-                final String line = br.readLine();
-                if (line == null) break;
+            String line=null;
+            while ((line = br.readLine()) != null) {
                 sb.append(line);
                 if (br.ready()) sb.append("\n");
             }

features/system-report/src/main/java/org/opennms/systemreport/SystemReport.java

@@ -35,6 +35,7 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -230,14 +231,14 @@ public List<SystemReportPlugin> getPlugins() {
         initializeSpring();
         final List<SystemReportPlugin> plugins = new ArrayList<SystemReportPlugin>(m_serviceRegistry.findProviders(SystemReportPlugin.class));
         Collections.sort(plugins);
-        return plugins;
+        return plugins.stream().filter(SystemReportPlugin::isVisible).collect(Collectors.toList());
     }
 
     public List<SystemReportFormatter> getFormatters() {
         initializeSpring();
         final List<SystemReportFormatter> formatters = new ArrayList<SystemReportFormatter>(m_serviceRegistry.findProviders(SystemReportFormatter.class));
         Collections.sort(formatters);
-        return formatters;
+        return formatters.stream().filter(SystemReportFormatter::isVisible).collect(Collectors.toList());
     }
 
     private void initializeSpring() {

features/system-report/src/main/java/org/opennms/systemreport/SystemReportFormatter.java

@@ -89,4 +89,7 @@ public interface SystemReportFormatter extends Comparable<SystemReportFormatter>
      */
     public boolean canStdout();
 
+
+    public boolean isVisible();
+
 }

features/system-report/src/main/java/org/opennms/systemreport/SystemReportPlugin.java

@@ -57,4 +57,6 @@ public interface SystemReportPlugin extends Comparable<SystemReportPlugin> {
     public boolean getFullOutputOnly();
 
     public boolean getOutputsFiles();
+
+    public boolean isVisible();
 }

features/system-report/src/main/java/org/opennms/systemreport/formatters/AbstractSystemReportFormatter.java

@@ -95,6 +95,9 @@ public void begin() {
     @Override
     public void end() {
     }
+
+    @Override
+    public boolean isVisible() { return false; }
 
     @Override
     public final int compareTo(final SystemReportFormatter o) { 

features/system-report/src/main/java/org/opennms/systemreport/formatters/ZipSystemReportFormatter.java

@@ -81,6 +81,9 @@ public boolean canStdout() {
         return false;
     }
 
+    @Override
+    public boolean isVisible() { return true; }
+
     @Override
     public void begin() {
         super.begin();

features/system-report/src/main/java/org/opennms/systemreport/opennms/ConfigurationReportPlugin.java

@@ -50,6 +50,9 @@ public int getPriority() {
         return 20;
     }
 
+    @Override
+    public boolean isVisible() { return true; }
+
     @Override
     public boolean getFullOutputOnly() {
         return true;

features/system-report/src/main/java/org/opennms/systemreport/opennms/LogReportPlugin.java

@@ -51,6 +51,9 @@ public boolean getFullOutputOnly() {
         return true;
     }
 
+    @Override
+    public boolean isVisible() { return true; }
+
     @Override
     public boolean getOutputsFiles() {
         return true;

features/system-report/src/main/java/org/opennms/systemreport/opennms/OpenNMSReportPlugin.java

@@ -23,11 +23,15 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
-
+import org.opennms.core.resource.Vault;
 import org.opennms.core.spring.BeanUtils;
+import org.opennms.core.utils.SystemInfoUtils;
+import org.opennms.core.utils.TimeSeries;
 import org.opennms.netmgt.dao.api.AlarmDao;
 import org.opennms.netmgt.dao.api.EventDao;
 import org.opennms.netmgt.dao.api.IpInterfaceDao;
@@ -72,6 +76,10 @@ public String getDescription() {
         return "OpenNMS core information, version, and basic configuration";
     }
 
+
+    @Override
+    public boolean isVisible() { return true; }
+
     @Override
     public int getPriority() {
         return 3;
@@ -80,17 +88,9 @@ public int getPriority() {
     @Override
     public Map<String, Resource> getEntries() {
         final TreeMap<String,Resource> map = new TreeMap<String,Resource>();
-        final InputStream is = this.getClass().getResourceAsStream("/version.properties");
-        if (is != null) {
-            Properties p = new Properties();
-            try {
-                p.load(is);
-                map.put("Version", getResource(p.getProperty("version.display")));
-            } catch (final IOException e) {
-                LOG.warn("Unable to load from version.properties", e);
-            }
-        }
-
+        map.put("OpenNMS Home",getResourceFromProperty("opennms.home"));
+        map.put("Version", getResource(Vault.getProperty("version.display")));
+
         if (m_nodeDao != null) {
             map.put("Number of Nodes", getResource(Integer.toString(m_nodeDao.countAll())));
         }
@@ -106,7 +106,35 @@ public Map<String, Resource> getEntries() {
         if (m_alarmDao != null) {
             map.put("Number of Alarms", getResource(Integer.toString(m_alarmDao.countAll())));
         }
+
+        RuntimeMXBean runtimeBean = getBean(ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class);
+        if (runtimeBean == null) {
+            LOG.info("falling back to local VM RuntimeMXBean");
+            runtimeBean = ManagementFactory.getRuntimeMXBean();
+        }
+        addGetters(runtimeBean, map);
+
+        map.put("OpenNMS Up Time",getResource( getOnmsUptimeAsString(runtimeBean) ));
+        map.put("Time-Series Strategy",getResource(TimeSeries.getTimeseriesStrategy().getName()));
+
         return map;
     }
 
+    private String getOnmsUptimeAsString(RuntimeMXBean runtimeBean){
+
+        long startTimeMillis = runtimeBean.getStartTime();
+
+        // Get the current time (in milliseconds since epoch)
+        long currentTimeMillis = System.currentTimeMillis();
+
+        // Calculate uptime
+        long uptimeMillis = currentTimeMillis - startTimeMillis;
+
+        long hours = uptimeMillis / (1000 * 60 * 60);
+        long minutes = (uptimeMillis % (1000 * 60 * 60)) / (1000 * 60);
+        long seconds = (uptimeMillis % (1000 * 60)) / 1000;
+
+        return String.format("%d hours, %d minutes, %d seconds", hours, minutes, seconds);
+    }
+
 }

features/system-report/src/main/java/org/opennms/systemreport/opennms/TopEventReportPlugin.java

@@ -45,7 +45,7 @@ public void afterPropertiesSet() throws Exception {
 
     @Override
     public String getName() {
-        return "TopEvent";
+        return "TopNEvents";
     }
 
     @Override
@@ -58,6 +58,9 @@ public int getPriority() {
         return 4;
     }
 
+    @Override
+    public boolean isVisible() { return true; }
+
     @Override
     public Map<String, Resource> getEntries() {
         final TreeMap<String,Resource> map = new TreeMap<String,Resource>();

features/system-report/src/main/java/org/opennms/systemreport/system/HardDriveReportPlugin.java

@@ -0,0 +1,68 @@
+/*
+ * Licensed to The OpenNMS Group, Inc (TOG) under one or more
+ * contributor license agreements.  See the LICENSE.md file
+ * distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * TOG licenses this file to You under the GNU Affero General
+ * Public License Version 3 (the "License") or (at your option)
+ * any later version.  You may not use this file except in
+ * compliance with the License.  You may obtain a copy of the
+ * License at:
+ *
+ *      https://www.gnu.org/licenses/agpl-3.0.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied.  See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.opennms.systemreport.system;
+
+import org.opennms.systemreport.AbstractSystemReportPlugin;
+import org.springframework.core.io.Resource;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+public class HardDriveReportPlugin  extends AbstractSystemReportPlugin {
+
+
+    @Override
+    public String getName() {
+        return "Hard Drive Stats";
+    }
+
+    @Override
+    public String getDescription() { return "Hard Drive Capacity and Performance Information"; }
+
+    @Override
+    public int getPriority() {
+        return 5;
+    }
+
+    @Override
+    public boolean isVisible() { return true; }
+
+    @Override
+    public Map<String, Resource> getEntries() {
+        final Map<String,Resource> map = new TreeMap<String,Resource>();
+
+        String[] dfCommand = {"bash", "-c", "df -h"};
+        final String dfOutput = slurpCommand(dfCommand);
+        if (dfOutput != null) {
+            map.put("Hard Drive Capacity", getResource("\n"+dfOutput));
+        }
+
+        String[] ioStatCommand = {"bash", "-c", "iostat -d"};
+        final String iostatOutput = slurpCommand(ioStatCommand);
+        if (iostatOutput != null) {
+            map.put("Hard Drive Performance", getResource("\n"+iostatOutput));
+        }
+
+        return map;
+    }
+
+}

features/system-report/src/main/java/org/opennms/systemreport/system/JavaReportPlugin.java

@@ -51,6 +51,9 @@ public int getPriority() {
         return 1;
     }
 
+    @Override
+    public boolean isVisible() { return true; }
+
     @Override
     public Map<String, Resource> getEntries() {
         final TreeMap<String,Resource> map = new TreeMap<String,Resource>();
@@ -68,6 +71,8 @@ public Map<String, Resource> getEntries() {
             memoryBean = ManagementFactory.getMemoryMXBean();
         }
 
+        map.put("Initial Heap Size", getResource(String.format("%d",memoryBean.getHeapMemoryUsage().getInit())));
+        map.put("Max Heap Size", getResource(String.format("%d",memoryBean.getHeapMemoryUsage().getMax())));
         addGetters(memoryBean, map);
 
         RuntimeMXBean runtimeBean = getBean(ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class);
@@ -86,29 +91,6 @@ public Map<String, Resource> getEntries() {
 
         addGetters(classBean, map);
 
-        /* this stuff is really not giving us anything useful
-        List<GarbageCollectorMXBean> beans = getBeans(ManagementFactory.GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE, GarbageCollectorMXBean.class);
-        if (beans == null || beans.size() == 0) {
-            LOG.info("falling back to local VM MemoryMXBean");
-            beans = ManagementFactory.getGarbageCollectorMXBeans();
-        }
-
-        LOG.trace("beans = {}", beans);
-        int collectorNum = 1;
-        for (final GarbageCollectorMXBean bean : beans) {
-            final Map<String,Resource> temp = new TreeMap<String,Resource>();
-            addGetters(bean, map);
-
-            final StringBuilder sb = new StringBuilder();
-            for (final String s : temp.keySet()) {
-                sb.append(s).append(": ").append(temp.get(s)).append("\n");
-            }
-            if (sb.length() > 0) sb.deleteCharAt(sb.length());
-            map.put("Garbage Collector " + collectorNum, getResource(sb.toString()));
-        }
-        */
-
         return map;
     }
-
 }