Jan 06 2026 dev (#387)

* sync code * update code to support brotli * update code to support brotli * update code to support brotli * sync code * fix findBrotli * sync code * sync code * sync code * sync code --------- Co-authored-by: Ned Wright <nedwright@proton.me> Co-authored-by: Daniel Eisenberg <danielei@checkpoint.com>
2026-01-17 16:00:26 +03:00 · 2026-01-13 17:17:52 +02:00
parent c1058db57d
commit e7b6e51b31
216 changed files with 12601 additions and 2825 deletions
--- a/core/metric/generic_metric.cc
+++ b/core/metric/generic_metric.cc
@@ -33,16 +33,35 @@ MetricMetadata::Description operator"" _desc(const char *str, size_t) { return M

 static const set<string> default_metrics = {
    "watchdogProcessStartupEventsSum",
-    "reservedNgenA",
-    "reservedNgenB",
-    "reservedNgenC"
-    "reservedNgenD"
-    "reservedNgenE",
-    "reservedNgenF",
-    "reservedNgenG"
-    "reservedNgenH",
-    "reservedNgenI",
-    "reservedNgenJ",
+    "reservedNgenA_WAAP telemetry",
+    "reservedNgenB_WAAP telemetry",
+    "reservedNgenC_WAAP telemetry",
+    "reservedNgenD_WAAP telemetry",
+    "reservedNgenE_WAAP telemetry",
+    "reservedNgenF_WAAP telemetry",
+    "reservedNgenG_WAAP telemetry",
+    "reservedNgenH_WAAP telemetry",
+    "reservedNgenI_WAAP telemetry",
+    "reservedNgenJ_WAAP telemetry",
+    "reservedNgenA_WAAP traffic telemetry",
+    "reservedNgenB_WAAP traffic telemetry",
+    "reservedNgenC_WAAP traffic telemetry",
+    "reservedNgenD_WAAP traffic telemetry",
+    "reservedNgenE_WAAP traffic telemetry",
+    "reservedNgenF_WAAP traffic telemetry",
+    "reservedNgenG_WAAP traffic telemetry",
+    "reservedNgenH_WAAP traffic telemetry",
+    "reservedNgenI_WAAP traffic telemetry",
+    "reservedNgenJ_WAAP traffic telemetry",
+    "reservedNgenA_WAAP attack type telemetry",
+    "reservedNgenB_WAAP attack type telemetry",
+    "reservedNgenC_WAAP attack type telemetry",
+    "reservedNgenD_WAAP attack type telemetry",
+    "reservedNgenE_WAAP attack type telemetry",
+    "reservedNgenF_WAAP attack type telemetry",
+    "reservedNgenG_WAAP attack type telemetry",
+    "reservedNgenH_WAAP attack type telemetry",
+    "reservedNgenI_WAAP attack type telemetry",
    "numberOfProtectedAssetsSample",
    "preventEngineMatchesSample",
    "detectEngineMatchesSample",
@@ -115,6 +134,7 @@ MetricCalc::getPrometheusMetrics(const std::string &metric_name, const string &a
    PrometheusData res;

    res.name = getMetricDotName() != "" ? getMetricDotName() : getMetricName();
+    res.unique_name = res.name + "_" + metric_name;
    res.type = getMetricType() == MetricType::GAUGE ? "gauge" : "counter";
    res.description = getMetircDescription();

--- a/core/metric/metric_ut/metric_ut.cc
+++ b/core/metric/metric_ut/metric_ut.cc
@@ -575,6 +575,7 @@ TEST_F(MetricTest, getPromeathusMetric)
        "    \"metrics\": [\n"
        "        {\n"
        "            \"metric_name\": \"cpuMax\",\n"
+        "            \"unique_name\": \"cpuMax_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -583,6 +584,7 @@ TEST_F(MetricTest, getPromeathusMetric)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuMin\",\n"
+        "            \"unique_name\": \"cpuMin_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -591,6 +593,7 @@ TEST_F(MetricTest, getPromeathusMetric)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuAvg\",\n"
+        "            \"unique_name\": \"cpuAvg_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -599,6 +602,7 @@ TEST_F(MetricTest, getPromeathusMetric)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuCurrent\",\n"
+        "            \"unique_name\": \"cpuCurrent_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -607,6 +611,7 @@ TEST_F(MetricTest, getPromeathusMetric)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuCounter\",\n"
+        "            \"unique_name\": \"cpuCounter_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -615,6 +620,7 @@ TEST_F(MetricTest, getPromeathusMetric)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuTotalCounter\",\n"
+        "            \"unique_name\": \"cpuTotalCounter_CPU usage\",\n"
        "            \"metric_type\": \"counter\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -665,6 +671,7 @@ TEST_F(MetricTest, getPromeathusMultiMap)
        "    \"metrics\": [\n"
        "        {\n"
        "            \"metric_name\": \"request.total\",\n"
+        "            \"unique_name\": \"GET_Bytes per URL\",\n"
        "            \"metric_type\": \"counter\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -673,6 +680,7 @@ TEST_F(MetricTest, getPromeathusMultiMap)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"request.total\",\n"
+        "            \"unique_name\": \"POST_Bytes per URL\",\n"
        "            \"metric_type\": \"counter\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -681,6 +689,7 @@ TEST_F(MetricTest, getPromeathusMultiMap)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"request.total\",\n"
+        "            \"unique_name\": \"GET_Bytes per URL\",\n"
        "            \"metric_type\": \"counter\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -750,6 +759,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "    \"metrics\": [\n"
        "        {\n"
        "            \"metric_name\": \"request.total\",\n"
+        "            \"unique_name\": \"GET_Bytes per URL\",\n"
        "            \"metric_type\": \"counter\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -758,6 +768,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"request.total\",\n"
+        "            \"unique_name\": \"POST_Bytes per URL\",\n"
        "            \"metric_type\": \"counter\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -766,6 +777,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"request.total\",\n"
+        "            \"unique_name\": \"GET_Bytes per URL\",\n"
        "            \"metric_type\": \"counter\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -774,6 +786,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuMax\",\n"
+        "            \"unique_name\": \"cpuMax_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -782,6 +795,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuMin\",\n"
+        "            \"unique_name\": \"cpuMin_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -790,6 +804,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuAvg\",\n"
+        "            \"unique_name\": \"cpuAvg_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -798,6 +813,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuCurrent\",\n"
+        "            \"unique_name\": \"cpuCurrent_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -806,6 +822,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuCounter\",\n"
+        "            \"unique_name\": \"cpuCounter_CPU usage\",\n"
        "            \"metric_type\": \"gauge\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","
@@ -814,6 +831,7 @@ TEST_F(MetricTest, getPromeathusTwoMetrics)
        "        },\n"
        "        {\n"
        "            \"metric_name\": \"cpuTotalCounter\",\n"
+        "            \"unique_name\": \"cpuTotalCounter_CPU usage\",\n"
        "            \"metric_type\": \"counter\",\n"
        "            \"metric_description\": \"\",\n"
        "            \"labels\": \"{agent=\\\"Unknown\\\",assetId=\\\"asset id\\\",id=\\\"87\\\","