V2.9.2 - Enable docker socket connections, fix period bug, and reduce number of messages sent (grouping)

Author: petersem

docker-compose.yml

@@ -13,22 +13,24 @@ services:
       # Optional - regardless of any other settings, you can ignore or include 'exited'
       EXCLUDE_EXITED: 'false'
       # Optional - only show when container state changes to being offline (paused, exited, running (unhealthy), or dead)
-      ONLY_OFFLINE_STATES: 'true'
+      ONLY_OFFLINE_STATES: 'false'
       # [Optional] -  set the poll period in seconds. Defaults to 10 seconds, which is also the minimum. 
-      PERIOD: 10
+      PERIOD: 30
       # [Optional] - Supress startup messages from being sent. Default is false
       DISABLE_STARTUP_MSG: 'false'
       # Specify the messaging platform and details, or omit this if only wanting container logs
-      MESSAGE_PLATFORM: 'telegram@your_bot_id@your_chat_id'
+      MESSAGE_PLATFORM: 'discord@webhookURL'
       # MESSAGE_PLATFORM: 'pushbullet@your_api_key@your_device_id'
       # MESSAGE_PLATFORM: 'pushover@your_user_key@your_app_api_token'
       # MESSAGE_PLATFORM: 'discord@webhook_url'
 
+      # [Optional] - Set this value to a docker socket URL, if you want to connect to docker this way. Leave it blank or omit it otherwise
+      # DOCKER_HOST: 'tcp://192.168.1.134:2375'
+
       # Filtering monitored containers - Optional - see readme
       # If missing or set to false (default), any containers with a "monocker.enable: 'false'" label will be excluded, and all others monitored.
       # If set to true, only containers with a "monocker.enable: 'true'" label will be included.
       LABEL_ENABLE: 'false'
-
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     restart: unless-stopped

index.js

@@ -17,7 +17,7 @@ const server = http.createServer(requestListener);
 server.listen(port, host, () => {});
 
 // main program
-let docker = new Docker();
+let docker = new Docker({socketPath: '/var/run/docker.sock'});
 // var docker = new Docker({
 //      protocol: 'http', //you can enforce a protocol
 //      host: '192.168.1.135',
@@ -103,7 +103,7 @@ async function send(message) {
 
 async function list(){
     let opts;
-
+    let messages = "";
     if(LABEL_ENABLE=='true'){
         opts = {
             "filters": '{"label": ["monocker.enable=true"]}'
@@ -123,15 +123,17 @@ async function list(){
             if(LABEL_ENABLE=='false' && JSON.stringify(c.Labels).includes('"monocker.enable":"false"')){
                 if(isFirstRun==true){
                     console.log('    - Excluding: ' + c.Names[0].replace("/",""));
-                    send('Excluding: ' + c.Names[0].replace("/",""));
+                    //send('Excluding: ' + c.Names[0].replace("/",""));
+                    messages += 'Excluding: ' + c.Names[0].replace("/","") + "\r\n";
                 }
             }
             else{
                 // If label_enable is true, list the specifically included containers
                 if(LABEL_ENABLE=='true' && JSON.stringify(c.Labels).includes('"monocker.enable":"true"')){
                     if(isFirstRun==true){
                         console.log('    - Monitoring: ' + c.Names[0].replace("/",""));
-                        send('Monitoring: ' + c.Names[0].replace("/",""));
+                        //send('Monitoring: ' + c.Names[0].replace("/",""));
+                        messages += 'Monitoring: ' + c.Names[0].replace("/","") + "\r\n";
                     }
                 }
                 // determine if covered by healthcheck
@@ -152,12 +154,15 @@ async function list(){
                         if(ONLY_OFFLINE_STATES=='true'){
                             if(offlineStates.includes(c.State) || offlineStates.includes(c.State + " " + hcStatus)){
                                 console.log("    - " + output);
-                                send(output);
+                                //send(output);
+                                messages += output + "\r\n";
                             }
                         }
                         else{
                             console.log("    - " + output);
-                            send(output);
+                            //send(output);
+                            console.log('*****' + output);
+                            messages += output+ "\r\n";
                         }
                     }
                 }
@@ -168,7 +173,8 @@ async function list(){
         if(isFirstRun==true){
             console.log("     - Currently monitoring " + newConArray.length + " (running) containers");
             if(DISABLE_STARTUP_MSG.toLowerCase()!='true'){
-                send("Currently monitoring " + newConArray.length + " (running) containers");
+                //send("Currently monitoring " + newConArray.length + " (running) containers");
+                messages += "Currently monitoring " + newConArray.length + " (running) containers" + "\r\n";
             }
             isFirstRun=false;
         }
@@ -184,11 +190,19 @@ async function list(){
                         output += " " + c.ImageID
                     }
                     console.log("    - " + output);
-                    send(output)
+                    //send(output)
+                    messages += output + "\r\n";
                 }
             });
         }
 
+        // do final send of any messages generated
+        //send(messages.length);
+        if(messages.length != 0){
+           send(messages);
+        }
+//        let now = new Date();
+//        send('tick: ' + now.toLocaleString());
         // assign new array to be current array state
         monContainers = newConArray;
     }, Promise.resolve(0));
@@ -203,6 +217,7 @@ async function run(){
     runClock = setInterval(run,(PERIOD * 1000));
 }
 
+
 console.log(`Monitoring started 
      - Messaging platform: ` + MESSAGE_PLATFORM.split("@")[0] + `
      - Polling period: ` + PERIOD + ` seconds 
@@ -215,12 +230,13 @@ console.log(`Monitoring started
 console.log()
 if(DISABLE_STARTUP_MSG.toLowerCase()!='true'){
     send(`Monitoring started 
-        - Messaging platform: ` + MESSAGE_PLATFORM.split("@")[0] + `
-        - Only offline state monitoring: ` + ONLY_OFFLINE_STATES + `
-        - Only include labelled containers: ` + LABEL_ENABLE + `
-        - Do not monitor 'Exited': ` + EXCLUDE_EXITED + `
-        - Disable Startup Messages: ` + DISABLE_STARTUP_MSG + `
-        - Display SHA ID: ` + SHA);
+        -- Messaging platform: ` + MESSAGE_PLATFORM.split("@")[0] +`
+        -- Polling period: ` + PERIOD + ` seconds` +`
+        -- Only offline state monitoring: ` + ONLY_OFFLINE_STATES +`
+        -- Only include labelled containers: ` + LABEL_ENABLE +`
+        -- Do not monitor 'Exited': ` + EXCLUDE_EXITED +`
+        -- Disable Startup Messages: ` + DISABLE_STARTUP_MSG +`
+        -- Display SHA ID: ` + SHA);
 }
 
 // start processing

package.json

@@ -1,6 +1,6 @@
 {
   "name": "monocker",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "Monitors and alerts for docker containers state changes",
   "main": "index.js",
   "scripts": {