[WIP] - Varnish matching hardened

.github/workflows/main.yml

@@ -56,14 +56,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [debian, centos, ubuntu]
-        version: [buster, bullseye, bookworm, 7, 8, 9, jammy, kinetic, lunar]
+        version: [buster, bullseye, bookworm, 7, 8, 9, noble, mantic, jammy, kinetic, lunar]
         exclude:
           - os: debian
             version: 7
           - os: debian
             version: 8
           - os: debian
             version: 9
+          - os: debian
+            version: noble
+          - os: debian
+            version: mantic
           - os: debian
             version: jammy
           - os: debian
@@ -76,6 +80,10 @@ jobs:
             version: bullseye
           - os: centos
             version: bookworm
+          - os: centos
+            version: noble
+          - os: centos
+            version: mantic
           - os: centos
             version: jammy
           - os: centos
@@ -107,7 +115,7 @@ jobs:
       with:
         ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }}
         repository: quanta-computing/buildozer
-        ref: 'new-packages-worflow'
+        ref: 'master'
         persist-credentials: true
         path: tools
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([quanta-agent],[1.3.0],[[email protected]])
+AC_INIT([quanta-agent],[1.3.1],[[email protected]])
 AM_INIT_AUTOMAKE([subdir-objects])
 LT_INIT
 

debian/changelog

@@ -1,3 +1,6 @@
+monikor (1.3.1) quanta; urgency=low
+  * Fix name matching in Varnish module when suffix are present
+
 monikor (1.3.0) quanta; urgency=low
 
   * Fixed time comparison in metric store

include/monikor.h

@@ -11,7 +11,7 @@
 typedef struct monikor_s monikor_t;
 #endif
 
-#define MONIKOR_VERSION "1.3.0"
+#define MONIKOR_VERSION "1.3.1"
 
 #include "server.h"
 #include "strl.h"

lib/modules/varnish/poll.c

@@ -70,21 +70,23 @@ size_t varnish_fetch_metrics(varnish_module_t *mod, const char *output) {
 
   gettimeofday(&clock, NULL);
   for (size_t i = 0; metrics[i].name; i++) {
-    if ((found = strstr(output, metrics[i].varnish_name))
-    && ((found - VARNISH_SMA_TRANSIENT_LEN < output)
-        || strncmp(found - VARNISH_SMA_TRANSIENT_LEN, VARNISH_SMA_TRANSIENT,
-            VARNISH_SMA_TRANSIENT_LEN))) {
-      char *endval;
-      char *val = found + strlen(metrics[i].name);
-      uint64_t value = strtoull(val, &endval, 10);
-      if (val == endval)
-        continue;
-      if (mod->instance)
-        sprintf(metric_name, "%s.%s", metrics[i].name, mod->instance);
-      else
-        sprintf(metric_name, "%s", metrics[i].name);
-      n_metrics += monikor_metric_push(mod->mon, monikor_metric_integer(
-        metric_name, &clock, value, metrics[i].flags));
+    for (found = output; (found = strstr(found, metrics[i].varnish_name)); found += strlen(metrics[i].varnish_name)) {
+      if (((found - VARNISH_SMA_TRANSIENT_LEN < output)
+          || strncmp(found - VARNISH_SMA_TRANSIENT_LEN, VARNISH_SMA_TRANSIENT, VARNISH_SMA_TRANSIENT_LEN))
+          && (isspace(found[strlen(metrics[i].varnish_name)]))) {
+        char *endval;
+        char *val = found + strlen(metrics[i].varnish_name);
+        uint64_t value = strtoull(val, &endval, 10);
+        if (val == endval)
+          continue;
+        if (mod->instance)
+          sprintf(metric_name, "%s.%s", metrics[i].name, mod->instance);
+        else
+          sprintf(metric_name, "%s", metrics[i].name);
+        n_metrics += monikor_metric_push(mod->mon, monikor_metric_integer(
+          metric_name, &clock, value, metrics[i].flags));
+        break;
+      }
     }
   }
 

monikor.spec

@@ -1,5 +1,5 @@
 Name:	monikor
-Version: 1.3.0
+Version: 1.3.1
 Release: 1%{?dist}
 Summary: Quanta monitoring packages
 Distribution: Quanta
@@ -8,7 +8,7 @@ Packager: Matthieu ROSINSKI <[email protected]>
 Group: Applications/Internet
 URL: http://www.quanta.io
 License: toto
-Source: monikor-1.3.0.tgz
+Source: monikor-1.3.1.tgz
 
 Buildroot	: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define _unpackaged_files_terminate_build 0