#177 - adding namespacere

OpenAF · Mar 12, 2024 · d9c5dc1 · d9c5dc1
1 parent b9a21f9
commit d9c5dc1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.package.yaml b/.package.yaml
@@ -19,7 +19,7 @@ name: nAttrMon
 main: nattrmon.js
 mainJob: ''
 license: Apache 2.0 license
-version: '20240131'
+version: '20240312'
 dependencies:
   openaf: '>=20230704'
 files:
@@ -309,7 +309,7 @@ filesHash:
   config/inputs.disabled/yaml/12.shellProcCmd.yaml: 1d76f6032fdcb37daefc808e154072ed8ab41b20
   config/inputs.disabled/yaml/13.RAIDSchedulers.yaml: fb921e230bbd12f5b3d9910ad6ebf17bb8def3fe
   config/inputs.disabled/yaml/15.endpoint_nAttrMon.yaml: dfe0fe3f5df32cac9ec8960c83d688e785efef09
-  config/inputs.disabled/yaml/15.javagc.yaml: e2c25bb7bbcd52dd7245c8a0c615f439581cf752
+  config/inputs.disabled/yaml/15.javagc.yaml: 34ad5aac2134bbc4e048f171af7415e7131c687e
   config/inputs.disabled/yaml/15.jmx.yaml: 0a350b3a84a7f56b9c9380b56dcabd4723b22c31
   config/inputs.disabled/yaml/15.remote_nAttrMon.yaml: f042f233fac37d349890943ee6a3c3a0344015de
   config/inputs.disabled/yaml/20.chvals.yaml: d03ba1bb4f7953bdb7f30226a42004f21a460e79
@@ -385,7 +385,7 @@ filesHash:
   config/objects/nInput_IMMemory.js: 69f6e3d39aa5a75c83d2e4f8e2ece0b28df7e3f1
   config/objects/nInput_Init.js: 9631c3e1fb87117000eb9da225ae760c9a4cd1a0
   config/objects/nInput_JMX.js: fce9011c729efafd1abe79588a274ee36aac3c16
-  config/objects/nInput_JavaGC.js: a5a4df79a3180045e099cd1ec6c5d0dc107c94ed
+  config/objects/nInput_JavaGC.js: 412e02069946eb2ce42554c29ac43f18d160c8e3
   config/objects/nInput_Kube_Events.js: 7a36aa2e72973d9369b856c6ef2ce4eddcab8459
   config/objects/nInput_Kube_NodesMetrics.js: 1eb83e5f43535c9b688424a022c4bcb38fc791f3
   config/objects/nInput_Kube_Pods.js: 3afb158052eb3eb1b9ffb70d68f0fa23c20b7c81

diff --git a/config/inputs.disabled/yaml/15.javagc.yaml b/config/inputs.disabled/yaml/15.javagc.yaml
@@ -50,6 +50,9 @@ input:
     type        : kube
     kube        :
       namespace: my-namespace-1, my-namespace-2
+      #namespacere: "^my"
+      #selector:
+      #  path: "[?status.phase=='Running']|[?starts_with(metadata.name, 'socks')]"
       selector :
         where:
         - cond: starts

diff --git a/config/objects/nInput_JavaGC.js b/config/objects/nInput_JavaGC.js
@@ -98,8 +98,14 @@ nInput_JavaGC.prototype.get = function(keyData, extra) {
         })
         m.kind      = _$(m.kind, "kube.kind").isString().default("FPO")
         m.namespace = _$(m.namespace, "kube.namespace").isString().default("default")
+        m.namespacere = _$(m.namespacere, "kube.namespacere").isString().default(__)
 
-        var nss = m.namespace.split(/ *, */), lst = []
+        let lst = [], nss = []
+        if (isDef(m.namespacere)) {
+            nss = $kube(m).getNS().map(r => r.Metadata.Name).filter(r => (new RegExp(m.namespacere)).test(r))
+        } else {
+            nss = m.namespace.split(/ *, */)
+        }
 
         nss.forEach(ns => {
             var its = $kube(m)["get" + m.kind](ns)
@@ -116,11 +122,11 @@ nInput_JavaGC.prototype.get = function(keyData, extra) {
         }
 
         ow.obj.filter(lst, m.selector).forEach(r => {
-          var newM    = clone(m)
+          var newM       = clone(m)
           newM.pod       = r.metadata.name
           newM.namespace = r.metadata.namespace
           try {
-            var res = nattrmon.shExec("kube", newM).exec(["/bin/sh", "-c", "/bin/sh -c 'echo ${TMPDIR:-/tmp} && echo \"||\" && find ${TMPDIR:-/tmp} -readable -type f'"])
+            var res = nattrmon.shExec("kube", newM).exec(["/bin/sh", "-c", "/bin/sh -c 'echo ${TMPDIR:-/tmp} && echo \"||\" && find ${TMPDIR:-/tmp} -perm -u+r -type f'"])
             if (isDef(res.stdout)) {
                 var _tmp = String(res.stdout).split("||")
                 var lst  = _tmp[1]