datamodel: sync the whole list logging groups

Now that manager is integrated into kresd,
I expect these will naturally keep it in sync.

diff --git a/lib/log.h b/lib/log.h
index cd760ec5a6f3510dd629e4c2218d4b7c54314cb2..a3887e57716e8dbfde3ab907fda78d84d6bb09de 100644 (file)
--- a/lib/log.h
+++ b/lib/log.h
@@ -31,8 +31,8 @@ void kr_log_target_set(kr_log_target_t target);
 
 /* Groups */
 
-/* Don't forget add *_TAG below, log_group_names[] item (log.c) and generate
- * new kres-gen.lua */
+/* Don't forget add *_TAG below, log_group_names[] item (log.c) and generate new kres-gen.lua
+ * and sync the _TAG list with list in ../manager/knot_resolver_manager/datamodel/logging_schema.py */
 enum kr_log_group {
        LOG_GRP_UNKNOWN = -1,
        LOG_GRP_SYSTEM = 1,  /* Must be first in enum. */

diff --git a/manager/knot_resolver_manager/datamodel/logging_schema.py b/manager/knot_resolver_manager/datamodel/logging_schema.py
index 6d39c5c8a28799d0d245be0bb3d8edb409799ec3..d2b7b7e7aca4b304e04ff4b95e41f7cbba5d0746 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/logging_schema.py
+++ b/manager/knot_resolver_manager/datamodel/logging_schema.py
@@ -22,6 +22,7 @@ LogGroupsEnum: TypeAlias = Literal[
     "manager",
     "supervisord",
     "cache-gc",
+    ## Now the LOG_GRP_*_TAG defines, exactly from ../../../lib/log.h
     "system",
     "cache",
     "io",
@@ -34,8 +35,6 @@ LogGroupsEnum: TypeAlias = Literal[
     "gnutls",
     "tls_cl",
     "xdp",
-    "zimprt",
-    "zscann",
     "doh",
     "dnssec",
     "hint",
@@ -66,7 +65,11 @@ LogGroupsEnum: TypeAlias = Literal[
     "contrl",
     "module",
     "devel",
-    "reqdbg",
+    "renum",
+    "exterr",
+    "rules",
+    "prlayr",
+    # "reqdbg",... (non-displayed section of the enum)
 ]
 
 

diff --git a/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2
index 2fb398e97e5058d3b12f6ce46a375fe6da6cf4a0..2d5937a832b7fe158a6ecefac45ffc2db402db2a 100644 (file)
--- a/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2
@@ -12,7 +12,7 @@ log_target('{{ cfg.logging.target }}')
 -- logging.groups
 log_groups({
 {% for g in cfg.logging.groups %}
-{% if g != "manager" and g != "supervisord" %}
+{% if g != "manager" and g != "supervisord" and g != "cache-gc" %}
     '{{ g }}',
 {% endif %}
 {% endfor %}