summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2024-01-17 09:39:13 +0100
committerGitHub <noreply@github.com>2024-01-17 09:39:13 +0100
commit282d9ecb5381317e4f56dd799fce52b45147414d (patch)
tree0de2111a69caca609df630b599f396b0689e736c /flags
parentd5bd82ab357743820e5ed4cd6d2d8e3aa498b02f (diff)
parent467b39cfcdef3013c2001ee7e39c7d39e4cf0a53 (diff)
Merge pull request #29876 from vespa-engine/hakonhall/make-current-flag-overrides-the-default
Define new default for nessus-agent-group flag
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index 2b8bff8e6b4..48afe9bd481 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -79,17 +79,17 @@ public class Flags {
INSTANCE_ID);
public static final List<String> VALID_NESSUS_AGENT_GROUPS = List.of(
- "", // Skip task
- ":legacy", // Run legacy task. Is a no-op outside YAHOO cloud.
+ ":default", // Use vespa-ci in CD systems, vespa-config on cfgs in prod, and :stop elsewhere
+ ":skip", // Skip task
":stop", // Stop / shut down Nessus if it is running
"All", // Link to the All group.
"vespa-ci", // Link to the vespa-ci group.
"vespa-config"); // Link to the vespa-config group.
public static final UnboundStringFlag NESSUS_AGENT_GROUP = defineStringFlag(
- "nessus-agent-group", ":legacy",
+ "nessus-agent-group", ":default",
List.of("hakonhall"), "2023-11-29", "2024-02-29",
- "Link nessusagent to the given group, or run legacy task (\":legacy\"), or disable task (\"\").",
+ "Link nessusagent to the given group, or do something special (when group start with ':').",
"Takes effect after host admin restart",
VALID_NESSUS_AGENT_GROUPS::contains,
ARCHITECTURE, CLAVE, NODE_TYPE);