diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2024-01-05 14:11:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-05 14:11:43 +0100 |
commit | 721deb5fc7f4897c117178cc147b23fd59c64fc4 (patch) | |
tree | 7afb6db9375044a859169e30b3013ab2e46faa5f | |
parent | 7f7f60b6886bed1c40249a17c9c3b74778f51879 (diff) | |
parent | 5853ffc7d8bd7d89606518ac84d64cb688838266 (diff) |
Merge pull request #29816 from vespa-engine/hakonhall/verify-all-valid-agent-groups-are-handled
Verify all valid agent groups are handled
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 15 |
1 files changed, 9 insertions, 6 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 e6de7d9ddbc..41c2ed0a9f7 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -78,17 +78,20 @@ public class Flags { "Takes effect at redeployment (requires restart)", 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. + ":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", List.of("hakonhall"), "2023-11-29", "2024-02-29", "Link nessusagent to the given group, or run legacy task (\":legacy\"), or disable task (\"\").", "Takes effect after host admin restart", - (String value) -> value.equals(":legacy") || // Run legacy task. Is a no-op outside YAHOO cloud. - value.equals(":stop") || // Stop / shut down Nessus if it is running - value.equals("All") || // Link to the All group. - value.equals("vespa-ci") || // Link to the vespa-ci group. - value.equals("vespa-config") || // Link to the vespa-config group. - value.isEmpty(), // Skip task + VALID_NESSUS_AGENT_GROUPS::contains, ARCHITECTURE, CLAVE); public static final UnboundIntFlag MAX_UNCOMMITTED_MEMORY = defineIntFlag( |