From 72842264dffeb13007ed8ba8b582b66817a9d194 Mon Sep 17 00:00:00 2001 From: lav Date: Thu, 23 May 2024 16:15:54 +0200 Subject: [PATCH] :ambulance: fix reponse if container logs are empty --- flows.json | 81 +++++++++++++++++++++++++++++++++++++++++++---- package-lock.json | 49 +++++++++++----------------- package.json | 2 +- 3 files changed, 95 insertions(+), 37 deletions(-) diff --git a/flows.json b/flows.json index 284c0c9..97c78ae 100644 --- a/flows.json +++ b/flows.json @@ -5829,7 +5829,7 @@ "y": 240, "wires": [ [ - "4162e2069a4e1e72" + "cd52bc77a65b9441" ], [], [] @@ -5847,7 +5847,7 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1060, + "x": 1140, "y": 220, "wires": [ [ @@ -5866,7 +5866,7 @@ "arraySpltType": "len", "stream": false, "addname": "", - "x": 890, + "x": 950, "y": 220, "wires": [ [ @@ -5893,7 +5893,7 @@ "from": "", "to": "", "reg": false, - "x": 920, + "x": 1060, "y": 280, "wires": [ [ @@ -5917,11 +5917,11 @@ "timeout": "", "count": "", "reduceRight": false, - "x": 1110, + "x": 1230, "y": 280, "wires": [ [ - "21201e5b02739ce2" + "7da9a83d74d9daed" ] ] }, @@ -5954,6 +5954,75 @@ ] ] }, + { + "id": "cd52bc77a65b9441", + "type": "switch", + "z": "1d08205d001d337b", + "name": "", + "property": "payload", + "propertyType": "msg", + "rules": [ + { + "t": "nempty" + }, + { + "t": "else" + } + ], + "checkall": "true", + "repair": false, + "outputs": 2, + "x": 830, + "y": 220, + "wires": [ + [ + "4162e2069a4e1e72" + ], + [ + "86a15ae6532cb93b" + ] + ] + }, + { + "id": "7da9a83d74d9daed", + "type": "http response", + "z": "1d08205d001d337b", + "name": "", + "statusCode": "", + "headers": { + "content-type": "text/plain; charset=utf-8" + }, + "x": 910, + "y": 320, + "wires": [] + }, + { + "id": "86a15ae6532cb93b", + "type": "change", + "z": "1d08205d001d337b", + "name": "no logs", + "rules": [ + { + "t": "set", + "p": "payload", + "pt": "msg", + "to": "{}", + "tot": "json" + } + ], + "action": "", + "property": "", + "from": "", + "to": "", + "reg": false, + "x": 860, + "y": 280, + "wires": [ + [ + "7da9a83d74d9daed" + ] + ] + }, { "id": "788067a8780c7835", "type": "http in", diff --git a/package-lock.json b/package-lock.json index 1dd3194..93d9f9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "netbox-docker-agent", - "version": "0.24.1", + "version": "0.24.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "netbox-docker-agent", - "version": "0.24.1", + "version": "0.24.2", "license": "ISC", "dependencies": { "express": "*", @@ -1301,9 +1301,9 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz", - "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", "dev": true, "dependencies": { "@babel/types": "^7.20.7" @@ -1578,9 +1578,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz", - "integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", + "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -1962,9 +1962,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001620", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001620.tgz", - "integrity": "sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==", + "version": "1.0.30001621", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz", + "integrity": "sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==", "dev": true, "funding": [ { @@ -2590,9 +2590,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.776", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.776.tgz", - "integrity": "sha512-s694bi3+gUzlliqxjPHpa9NRTlhzTgB34aan+pVKZmOTGy2xoZXl+8E1B8i5p5rtev3PKMK/H4asgNejC+YHNg==", + "version": "1.4.779", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.779.tgz", + "integrity": "sha512-oaTiIcszNfySXVJzKcjxd2YjPxziAd+GmXyb2HbidCeFo6Z88ygOT7EimlrEQhM2U08VhSrbKhLOXP0kKUCZ6g==", "dev": true }, "node_modules/emittery": { @@ -3459,6 +3459,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -4490,30 +4491,18 @@ } }, "node_modules/micromatch": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.6.tgz", - "integrity": "sha512-Y4Ypn3oujJYxJcMacVgcs92wofTHxp9FzfDpQON4msDefoC0lb3ETvQLOdLcbhSwU1bz8HrL/1sygfBIHudrkQ==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "dev": true, "dependencies": { "braces": "^3.0.3", - "picomatch": "^4.0.2" + "picomatch": "^2.3.1" }, "engines": { "node": ">=8.6" } }, - "node_modules/micromatch/node_modules/picomatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", - "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/mime": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", diff --git a/package.json b/package.json index 4c4d635..6424ec4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "netbox-docker-agent", - "version": "0.24.1", + "version": "0.24.2", "description": "Saashup agent for netbox manager", "main": "index.js", "scripts": {