From fec33cb76664692bc6b71406d85e13f194fb3295 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Tue, 24 Sep 2024 01:46:50 +0200
Subject: [PATCH 1/2] openscapes: re-create node pools to get all relevant tags

Ensures 2i2c.org/cluster-name tag is applied to node pools, which
enables us to filter based on two less tags specifically for openscapes.
---
 eksctl/openscapes.jsonnet | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/eksctl/openscapes.jsonnet b/eksctl/openscapes.jsonnet
index 01f4b00fd1..f30c2f2f57 100644
--- a/eksctl/openscapes.jsonnet
+++ b/eksctl/openscapes.jsonnet
@@ -25,13 +25,13 @@ local nodeAz = "us-west-2b";
 // A `node.kubernetes.io/instance-type label is added, so pods
 // can request a particular kind of node with a nodeSelector
 local notebookNodes = [
-    { 
+    {
         instanceType: "r5.xlarge",
         namePrefix: "nb-staging",
         labels+: { "2i2c/hub-name": "staging" },
         tags+: { "2i2c:hub-name": "staging" }
     },
-    { 
+    {
         instanceType: "r5.4xlarge",
         namePrefix: "nb-staging",
         labels+: { "2i2c/hub-name": "staging" },
@@ -43,13 +43,20 @@ local notebookNodes = [
         labels+: { "2i2c/hub-name": "staging" },
         tags+: { "2i2c:hub-name": "staging" }
     },
-    { 
+    {
+        // FIXME: tainted, to be deleted when empty, replaced by equivalent already
         instanceType: "r5.xlarge",
         namePrefix: "nb-prod",
         labels+: { "2i2c/hub-name": "prod" },
         tags+: { "2i2c:hub-name": "prod" }
     },
-    { 
+    {
+        instanceType: "r5.xlarge",
+        namePrefix: "nb-prod-a",
+        labels+: { "2i2c/hub-name": "prod" },
+        tags+: { "2i2c:hub-name": "prod" }
+    },
+    {
         instanceType: "r5.4xlarge",
         namePrefix: "nb-prod",
         labels+: { "2i2c/hub-name": "prod" },
@@ -61,13 +68,13 @@ local notebookNodes = [
         labels+: { "2i2c/hub-name": "prod" },
         tags+: { "2i2c:hub-name": "prod" }
     },
-    { 
+    {
         instanceType: "r5.xlarge",
         namePrefix: "nb-workshop",
         labels+: { "2i2c/hub-name": "workshop" },
         tags+: { "2i2c:hub-name": "workshop" }
     },
-    { 
+    {
         instanceType: "r5.4xlarge",
         namePrefix: "nb-workshop",
         labels+: { "2i2c/hub-name": "workshop" },
@@ -149,7 +156,7 @@ local daskNodes = [
     [
         ng + {
             namePrefix: 'core',
-            nameSuffix: 'b',
+            nameSuffix: 'a',
             nameIncludeInstanceType: false,
             availabilityZones: [nodeAz],
             ssh: {

From c8698b81701acc5d98986d05f78ebfcf1202616e Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Tue, 24 Sep 2024 01:49:43 +0200
Subject: [PATCH 2/2] aws-ce-grafana-backend: add fixme note

---
 helm-charts/aws-ce-grafana-backend/mounted-files/const.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/helm-charts/aws-ce-grafana-backend/mounted-files/const.py b/helm-charts/aws-ce-grafana-backend/mounted-files/const.py
index 8823c35936..13da8b772b 100644
--- a/helm-charts/aws-ce-grafana-backend/mounted-files/const.py
+++ b/helm-charts/aws-ce-grafana-backend/mounted-files/const.py
@@ -73,6 +73,11 @@
                 "MatchOptions": ["EQUALS"],
             },
         },
+        # FIXME: The inclusion of tags 2i2c:hub-name and 2i2c:node-purpose below
+        #        in this filter is a patch to capture openscapes data from 1st
+        #        July and up to 24th September 2024, and can be removed once
+        #        that date range is considered irrelevant.
+        #
         {
             "Not": {
                 "Tags": {