diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-12-05 15:47:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 15:47:04 +0100 |
| commit | 73cd84ef4fb86ff79428bf44b7550696449abd3a (patch) | |
| tree | c2c3b73c2b78ef05338c6b5dae7a78a6a14c6b89 | |
| parent | eb1ccacc4f5dffadff0f716a525c692c1c50f610 (diff) | |
| parent | cf2d0487f9fa2dc9d64fbc19309868ab93bcaa49 (diff) | |
Merge pull request #29556 from vespa-engine/hakonhall/support-other-nessus-task-modes
Support other nessus task modes
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 11 |
1 files changed, 7 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 c486f239bef..5e395f04956 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -79,12 +79,15 @@ public class Flags { INSTANCE_ID); public static final UnboundStringFlag NESSUS_AGENT_GROUP = defineStringFlag( - "nessus-agent-group", "All", + "nessus-agent-group", ":legacy", List.of("hakonhall"), "2023-11-29", "2023-12-29", - "Either run nessusagent as before (All), or link against \"vespa-ci\"," + - " or disable the nessusagent (empty string \"\")", + "Link nessusagent to the given group, or run legacy task (\":legacy\"), or disable task (\"\").", "Takes effect after host admin restart", - (String value) -> value.equals("All") || value.equals("vespa-ci") || value.isEmpty(), + (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 All group. + value.equals("vespa-ci") || // Link to vespa-ci group. + value.isEmpty(), // Skip task ARCHITECTURE, CLAVE); public static final UnboundIntFlag MAX_UNCOMMITTED_MEMORY = defineIntFlag( |