Skip to content

Commit fa0a1a9

Browse files
committed
cf-agent now accepts report_metatags_include and report_metatags_exclude in body agent control
They filter which classes `cf-agent` records in leech2 blocks. This moves class filtering from `cf-serverd` to `cf-agent`. The `report_data_select` filter in `cf-serverd` stays for now and will be removed later. Changelog: Title Ticket: ENT-14507 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent af5dfe8 commit fa0a1a9

5 files changed

Lines changed: 32 additions & 0 deletions

File tree

‎cf-agent/cf-agent.c‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,8 @@ static void KeepPromises(EvalContext *ctx, const Policy *policy, GenericAgentCon
943943

944944
static void KeepControlPromises(EvalContext *ctx, const Policy *policy, GenericAgentConfig *config)
945945
{
946+
assert(config != NULL);
947+
946948
Seq *constraints = ControlBodyConstraints(policy, AGENT_TYPE_AGENT);
947949
if (constraints)
948950
{
@@ -1302,6 +1304,24 @@ static void KeepControlPromises(EvalContext *ctx, const Policy *policy, GenericA
13021304
continue;
13031305
}
13041306

1307+
if (StringEqual(cp->lval, CFA_CONTROLBODY[AGENT_CONTROL_REPORT_METATAGS_INCLUDE].lval))
1308+
{
1309+
assert(value_type == CF_DATA_TYPE_STRING_LIST);
1310+
RlistDestroy(config->agent_specific.agent.report_metatags_include);
1311+
config->agent_specific.agent.report_metatags_include = RlistCopy(value);
1312+
Log(LOG_LEVEL_VERBOSE, "Setting report_metatags_include");
1313+
continue;
1314+
}
1315+
1316+
if (StringEqual(cp->lval, CFA_CONTROLBODY[AGENT_CONTROL_REPORT_METATAGS_EXCLUDE].lval))
1317+
{
1318+
assert(value_type == CF_DATA_TYPE_STRING_LIST);
1319+
RlistDestroy(config->agent_specific.agent.report_metatags_exclude);
1320+
config->agent_specific.agent.report_metatags_exclude = RlistCopy(value);
1321+
Log(LOG_LEVEL_VERBOSE, "Setting report_metatags_exclude");
1322+
continue;
1323+
}
1324+
13051325
if (StringEqual(cp->lval, CFA_CONTROLBODY[AGENT_CONTROL_EVALUATION_ORDER].lval))
13061326
{
13071327
assert(value_type == CF_DATA_TYPE_STRING);

‎libpromises/cf3.defs.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,8 @@ typedef enum
498498
AGENT_CONTROL_COPYFROM_RESTRICT_KEYS,
499499
AGENT_CONTROL_EVALUATION_ORDER,
500500
AGENT_CONTROL_DEFAULT_DIRECTORY_CREATE_MODE,
501+
AGENT_CONTROL_REPORT_METATAGS_INCLUDE,
502+
AGENT_CONTROL_REPORT_METATAGS_EXCLUDE,
501503
AGENT_CONTROL_NONE
502504
} AgentControl;
503505

‎libpromises/generic_agent.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2620,6 +2620,10 @@ GenericAgentConfig *GenericAgentConfigNewDefault(AgentType agent_type, bool tty_
26202620
/* Log classes */
26212621
config->agent_specific.agent.report_class_log = false;
26222622

2623+
/* Report class metatags filter (NULL means no filter) */
2624+
config->agent_specific.agent.report_metatags_include = NULL;
2625+
config->agent_specific.agent.report_metatags_exclude = NULL;
2626+
26232627
config->agent_specific.common.no_augments = false;
26242628
config->agent_specific.common.no_host_specific = false;
26252629

@@ -2664,6 +2668,8 @@ void GenericAgentConfigDestroy(GenericAgentConfig *config)
26642668
free(config->agent_specific.agent.bootstrap_host);
26652669
free(config->agent_specific.agent.bootstrap_ip);
26662670
free(config->agent_specific.agent.bootstrap_port);
2671+
RlistDestroy(config->agent_specific.agent.report_metatags_include);
2672+
RlistDestroy(config->agent_specific.agent.report_metatags_exclude);
26672673
free(config);
26682674
}
26692675
}

‎libpromises/generic_agent.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ typedef struct
9797

9898
// BODY AGENT CONTROL
9999
bool report_class_log;
100+
Rlist *report_metatags_include;
101+
Rlist *report_metatags_exclude;
100102
} agent;
101103
struct
102104
{

‎libpromises/mod_common.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ const ConstraintSyntax CFA_CONTROLBODY[] =
325325
ConstraintSyntaxNewStringList("copyfrom_restrict_keys", ".*", "A list of key hashes to restrict copy_from to", SYNTAX_STATUS_NORMAL),
326326
ConstraintSyntaxNewString("evaluation_order", "(classic|top_down)", "Order of evaluation of promises of agent", SYNTAX_STATUS_NORMAL),
327327
ConstraintSyntaxNewString("default_directory_create_mode", ".*", "Default directory create mode (defaults to 0700 if not specified)", SYNTAX_STATUS_NORMAL),
328+
ConstraintSyntaxNewStringList("report_metatags_include", CF_ANYSTRING, "List of regex filters for metatags of classes to be included into reports", SYNTAX_STATUS_NORMAL),
329+
ConstraintSyntaxNewStringList("report_metatags_exclude", CF_ANYSTRING, "List of regex filters for metatags of classes to be excluded from reports", SYNTAX_STATUS_NORMAL),
328330
ConstraintSyntaxNewNull()
329331
};
330332

0 commit comments

Comments
 (0)