New python service

.gitignore

@@ -13,6 +13,8 @@
 
 # Others #
 ##########
+__pycache__
+*.pyc
 *.swp
 Thumbs.db
 config.php

LibreNMS/ComposerHelper.php

@@ -42,8 +42,9 @@ public static function postInstall(Event $event)
     {
         if (!file_exists('.env')) {
             self::setPermissions();
-            self::populateEnv();
         }
+
+        self::populateEnv();
     }
 
     public static function preUpdate(Event $event)
@@ -80,34 +81,34 @@ private static function populateEnv()
         if (!file_exists('.env')) {
             copy('.env.example', '.env');
             self::exec('php artisan key:generate');
-
-            $config = [
-                'db_host' => '',
-                'db_port' => '',
-                'db_name' => '',
-                'db_user' => '',
-                'db_pass' => '',
-                'db_socket' => '',
-                'base_url' => '',
-                'user' => '',
-                'group' => '',
-            ];
-
-            @include 'config.php';
-
-            self::setEnv([
-                'NODE_ID'        => uniqid(),
-                'DB_HOST'        => $config['db_host'],
-                'DB_PORT'        => $config['db_port'],
-                'DB_USERNAME'    => $config['db_user'],
-                'DB_PASSWORD'    => $config['db_pass'],
-                'DB_DATABASE'    => $config['db_name'],
-                'DB_SOCKET'      => $config['db_socket'],
-                'APP_URL'        => $config['base_url'],
-                'LIBRENMS_USER'  => $config['user'],
-                'LIBRENMS_GROUP' => $config['group'],
-            ]);
         }
+
+        $config = [
+            'db_host' => '',
+            'db_port' => '',
+            'db_name' => '',
+            'db_user' => '',
+            'db_pass' => '',
+            'db_socket' => '',
+            'base_url' => '',
+            'user' => '',
+            'group' => '',
+        ];
+
+        @include 'config.php';
+
+        self::setEnv([
+            'NODE_ID'        => uniqid(),
+            'DB_HOST'        => $config['db_host'],
+            'DB_PORT'        => $config['db_port'],
+            'DB_USERNAME'    => $config['db_user'],
+            'DB_PASSWORD'    => $config['db_pass'],
+            'DB_DATABASE'    => $config['db_name'],
+            'DB_SOCKET'      => $config['db_socket'],
+            'APP_URL'        => $config['base_url'],
+            'LIBRENMS_USER'  => $config['user'],
+            'LIBRENMS_GROUP' => $config['group'],
+        ]);
     }
 
     /**
@@ -118,8 +119,10 @@ private static function populateEnv()
      */
     private static function setEnv($settings, $file = '.env')
     {
-        $content = file_get_contents($file);
-        if (substr($content, -1) !== "\n") {
+        $original_content = $content = file_get_contents($file);
+
+        // ensure trailing line return
+        if (substr($content, -1) !== PHP_EOL) {
             $content .= PHP_EOL;
         }
 
@@ -143,7 +146,10 @@ private static function setEnv($settings, $file = '.env')
             }
         }
 
-        file_put_contents($file, $content);
+        // only write if the content has changed
+        if ($content !== $original_content) {
+            file_put_contents($file, $content);
+        }
     }
 
     private static function setPermissions()

LibreNMS/Config.php

@@ -314,6 +314,18 @@ public static function has($key)
         return is_array($curr) && isset($curr[$last]);
     }
 
+    /**
+     * Serialise the whole configuration to json for use in external processes.
+     *
+     * @return string
+     */
+    public static function json_encode()
+    {
+        global $config;
+
+        return json_encode($config);
+    }
+
     /**
      * merge the database config with the global config
      * Global config overrides db

LibreNMS/Validations/Poller.php

@@ -90,6 +90,15 @@ private function checkLastPolled(Validator $validator)
                     $validator->fail("The poller ($poller) has not completed within the last 5 minutes, check the cron job.");
                 }
             }
+        } elseif (dbFetchCell('SELECT COUNT(*) FROM `poller_cluster`')) {
+            $sql = "SELECT `node_id` FROM `poller_cluster` WHERE `last_report` <= DATE_ADD(NOW(), INTERVAL - 5 MINUTE)";
+
+            $pollers = dbFetchColumn($sql);
+            if (count($pollers) > 0) {
+                foreach ($pollers as $poller) {
+                    $validator->fail("The poller cluster member ($poller) has not checked in within the last 5 minutes, check that it is running and healthy.");
+                }
+            }
         } else {
             $validator->fail('The poller has never run or you are not using poller-wrapper.py, check the cron job.');
         }