From a4e0469ade8d1ffd7365fce159188e12d75b9842 Mon Sep 17 00:00:00 2001 From: Brandon Kimberly Date: Tue, 30 Apr 2024 14:38:55 -0700 Subject: [PATCH] Update Kustomization paths --- .../eks-infra/v1.0.0/iac/eks-monitoring-cfn-template.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solutions/oss/eks-infra/v1.0.0/iac/eks-monitoring-cfn-template.json b/solutions/oss/eks-infra/v1.0.0/iac/eks-monitoring-cfn-template.json index c34f60a42..1272c5baa 100644 --- a/solutions/oss/eks-infra/v1.0.0/iac/eks-monitoring-cfn-template.json +++ b/solutions/oss/eks-infra/v1.0.0/iac/eks-monitoring-cfn-template.json @@ -1021,7 +1021,7 @@ "Outputs.existingeksopensourceobservabilityacceleratorexistingeksopensourceobservabilityacceleratorimportedclustercfnfinalrun5BCB62C4KubectlProviderframeworkonEvent15AF23A0Arn" ] }, - "Manifest": "[{\"apiVersion\":\"source.toolkit.fluxcd.io/v1beta2\",\"kind\":\"GitRepository\",\"metadata\":{\"name\":\"grafana-dashboards\",\"namespace\":\"grafana-operator\",\"labels\":{\"aws.cdk.eks/prune-c889cfb51e63963b04f17d9f739e645b718ac414ab\":\"\"}},\"spec\":{\"interval\":\"5m0s\",\"url\":\"https://github.com/aws-observability/aws-observability-accelerator\",\"ref\":{\"branch\":\"main\"}}}]", + "Manifest": "[{\"apiVersion\":\"source.toolkit.fluxcd.io/v1beta2\",\"kind\":\"GitRepository\",\"metadata\":{\"name\":\"grafana-dashboards\",\"namespace\":\"grafana-operator\",\"labels\":{\"aws.cdk.eks/prune-c889cfb51e63963b04f17d9f739e645b718ac414ab\":\"\"}},\"spec\":{\"interval\":\"5m0s\",\"url\":\"https://github.com/aws-observability/observability-best-practices\",\"ref\":{\"branch\":\"main\"}}}]", "ClusterName": { "Ref": "EKSClusterName" }, "RoleArn": { "Ref": "EKSClusterAdminRoleARN" }, "PruneLabel": "aws.cdk.eks/prune-c889cfb51e63963b04f17d9f739e645b718ac414ab" @@ -1045,7 +1045,7 @@ "Fn::Join": [ "", [ - "[{\"apiVersion\":\"kustomize.toolkit.fluxcd.io/v1beta2\",\"kind\":\"Kustomization\",\"metadata\":{\"name\":\"grafana-dashboards-0\",\"namespace\":\"grafana-operator\",\"labels\":{\"aws.cdk.eks/prune-c80189b05261ce7a989762d342cb743fa4dd8720bd\":\"\"}},\"spec\":{\"interval\":\"5m0s\",\"sourceRef\":{\"kind\":\"GitRepository\",\"name\":\"grafana-dashboards\"},\"path\":\"./artifacts/grafana-operator-manifests/eks/infrastructure\",\"prune\":true,\"timeout\":\"1m\",\"postBuild\":{\"substitute\":{\"GRAFANA_CLUSTER_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/cluster.json\",\"GRAFANA_KUBELET_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/kubelet.json\",\"GRAFANA_NSWRKLDS_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/namespace-workloads.json\",\"GRAFANA_NODEEXP_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/nodeexporter-nodes.json\",\"GRAFANA_NODES_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/nodes.json\",\"GRAFANA_WORKLOADS_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/workloads.json\",\"GRAFANA_APISERVER_BASIC_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-basic.json\",\"GRAFANA_APISERVER_ADVANCED_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-advanced.json\",\"GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-troubleshooting.json\",\"AMG_AWS_REGION\":\"", + "[{\"apiVersion\":\"kustomize.toolkit.fluxcd.io/v1beta2\",\"kind\":\"Kustomization\",\"metadata\":{\"name\":\"grafana-dashboards-0\",\"namespace\":\"grafana-operator\",\"labels\":{\"aws.cdk.eks/prune-c80189b05261ce7a989762d342cb743fa4dd8720bd\":\"\"}},\"spec\":{\"interval\":\"5m0s\",\"sourceRef\":{\"kind\":\"GitRepository\",\"name\":\"grafana-dashboards\"},\"path\":\"./solutions/oss/eks-infra/v1.0.0/infrastructure\",\"prune\":true,\"timeout\":\"1m\",\"postBuild\":{\"substitute\":{\"GRAFANA_CLUSTER_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/cluster.json\",\"GRAFANA_KUBELET_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/kubelet.json\",\"GRAFANA_NSWRKLDS_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/namespace-workloads.json\",\"GRAFANA_NODEEXP_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/nodeexporter-nodes.json\",\"GRAFANA_NODES_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/nodes.json\",\"GRAFANA_WORKLOADS_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/workloads.json\",\"GRAFANA_APISERVER_BASIC_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-basic.json\",\"GRAFANA_APISERVER_ADVANCED_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-advanced.json\",\"GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-troubleshooting.json\",\"AMG_AWS_REGION\":\"", { "Ref": "AWS::Region" }, @@ -1088,7 +1088,7 @@ "Fn::Join": [ "", [ - "[{\"apiVersion\":\"kustomize.toolkit.fluxcd.io/v1beta2\",\"kind\":\"Kustomization\",\"metadata\":{\"name\":\"grafana-dashboards-1\",\"namespace\":\"grafana-operator\",\"labels\":{\"aws.cdk.eks/prune-c81c0d640fba1dba5a026469fe91e93bf568241147\":\"\"}},\"spec\":{\"interval\":\"5m0s\",\"sourceRef\":{\"kind\":\"GitRepository\",\"name\":\"grafana-dashboards\"},\"path\":\"./artifacts/grafana-operator-manifests/eks/apiserver\",\"prune\":true,\"timeout\":\"1m\",\"postBuild\":{\"substitute\":{\"GRAFANA_CLUSTER_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/cluster.json\",\"GRAFANA_KUBELET_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/kubelet.json\",\"GRAFANA_NSWRKLDS_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/namespace-workloads.json\",\"GRAFANA_NODEEXP_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/nodeexporter-nodes.json\",\"GRAFANA_NODES_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/nodes.json\",\"GRAFANA_WORKLOADS_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/workloads.json\",\"GRAFANA_APISERVER_BASIC_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-basic.json\",\"GRAFANA_APISERVER_ADVANCED_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-advanced.json\",\"GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-troubleshooting.json\",\"AMG_AWS_REGION\":\"", + "[{\"apiVersion\":\"kustomize.toolkit.fluxcd.io/v1beta2\",\"kind\":\"Kustomization\",\"metadata\":{\"name\":\"grafana-dashboards-1\",\"namespace\":\"grafana-operator\",\"labels\":{\"aws.cdk.eks/prune-c81c0d640fba1dba5a026469fe91e93bf568241147\":\"\"}},\"spec\":{\"interval\":\"5m0s\",\"sourceRef\":{\"kind\":\"GitRepository\",\"name\":\"grafana-dashboards\"},\"path\":\"./solutions/oss/eks-infra/v1.0.0/apiserver\",\"prune\":true,\"timeout\":\"1m\",\"postBuild\":{\"substitute\":{\"GRAFANA_CLUSTER_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/cluster.json\",\"GRAFANA_KUBELET_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/kubelet.json\",\"GRAFANA_NSWRKLDS_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/namespace-workloads.json\",\"GRAFANA_NODEEXP_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/nodeexporter-nodes.json\",\"GRAFANA_NODES_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/nodes.json\",\"GRAFANA_WORKLOADS_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/infrastructure/workloads.json\",\"GRAFANA_APISERVER_BASIC_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-basic.json\",\"GRAFANA_APISERVER_ADVANCED_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-advanced.json\",\"GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL\":\"https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v1.0.0/grafana-dashboards/apiserver/apiserver-troubleshooting.json\",\"AMG_AWS_REGION\":\"", { "Ref": "AWS::Region" },