From 4c677961c4bbf35b7d0ee3cc3a14b4fb5a857b24 Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Thu, 11 Aug 2022 08:49:25 -0400 Subject: [PATCH 1/4] FIX: Fix TLP options in Cases to align with TLP 2.0 #8469 --- salt/soc/files/soc/presets.tlp.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/salt/soc/files/soc/presets.tlp.json b/salt/soc/files/soc/presets.tlp.json index 6ef37164d..5ae860b28 100644 --- a/salt/soc/files/soc/presets.tlp.json +++ b/salt/soc/files/soc/presets.tlp.json @@ -1,9 +1,10 @@ { "labels": [ - "white", - "green", - "amber", - "red" + "CLEAR", + "GREEN", + "AMBER", + "AMBER+STRICT", + "RED" ], "customEnabled": false -} \ No newline at end of file +} From 4003876465bb26abafc2ce0ec5036f24fb88d849 Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Thu, 11 Aug 2022 08:49:54 -0400 Subject: [PATCH 2/4] FIX: Fix TLP options in Cases to align with TLP 2.0 #8469 --- salt/soc/files/soc/presets.pap.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/salt/soc/files/soc/presets.pap.json b/salt/soc/files/soc/presets.pap.json index 6ef37164d..22aca7536 100644 --- a/salt/soc/files/soc/presets.pap.json +++ b/salt/soc/files/soc/presets.pap.json @@ -1,9 +1,9 @@ { "labels": [ - "white", - "green", - "amber", - "red" + "WHITE", + "GREEN", + "AMBER", + "RED" ], "customEnabled": false -} \ No newline at end of file +} From 7bf26034140f78f206b2b32439e7f4dbb6e0733b Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Thu, 11 Aug 2022 15:32:49 -0400 Subject: [PATCH 3/4] revert to lower case #8469 --- salt/soc/files/soc/presets.pap.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/soc/files/soc/presets.pap.json b/salt/soc/files/soc/presets.pap.json index 22aca7536..8b254b020 100644 --- a/salt/soc/files/soc/presets.pap.json +++ b/salt/soc/files/soc/presets.pap.json @@ -1,9 +1,9 @@ { "labels": [ - "WHITE", - "GREEN", - "AMBER", - "RED" + "white", + "green", + "amber", + "red" ], "customEnabled": false } From 32c29b28eba30bf6769539bf449b88ebedf948a6 Mon Sep 17 00:00:00 2001 From: Doug Burks Date: Thu, 11 Aug 2022 15:33:30 -0400 Subject: [PATCH 4/4] revert to lower case #8469 --- salt/soc/files/soc/presets.tlp.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/salt/soc/files/soc/presets.tlp.json b/salt/soc/files/soc/presets.tlp.json index 5ae860b28..5cefe4ada 100644 --- a/salt/soc/files/soc/presets.tlp.json +++ b/salt/soc/files/soc/presets.tlp.json @@ -1,10 +1,10 @@ { "labels": [ - "CLEAR", - "GREEN", - "AMBER", - "AMBER+STRICT", - "RED" + "clear", + "green", + "amber", + "amber+strict", + "red" ], "customEnabled": false }