Skip to content

Commit

Permalink
Merge pull request #143 from Brandon-Kimberly/main
Browse files Browse the repository at this point in the history 
Naming changes for EKS Infra Monitoring solution v2
  • Loading branch information
@mhausenblas
mhausenblas committed Jun 11, 2024
2 parents e352b72 + ed03f27 commit 928c62b
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 26 deletions.
24 changes: 13 additions & 11 deletions solutions/oss/eks-infra/v2.0.0/iac/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,37 @@ formatted_pattern_names := $(patsubst %.ts,%,$(pattern_files))
# Dependecies
HOMEBREW_LIBS := nvm typescript argocd

BIN_NAME := aws-o11y-solution-eks-infra


deps: bootstrap
npm install

lint:
lint:
$(ESLINT) . --ext .js,.jsx,.ts,.tsx

lint-fix:
lint-fix:
$(ESLINT) . --ext .js,.jsx,.ts,.tsx --fix

build:
rm -rf dist && $(TSC) --skipLibCheck

compile:
$(TSC) --build --incremental
$(TSC) --build --incremental

list:
@$ echo "To work with patterns use: \n\t$$ make pattern <pattern-name> <list | deploy | synth | destroy>"
@$ echo "Example:\n\t$$ make pattern single-new-eks-opensource-observability deploy \n\nPatterns: \n"
list:
@$ echo "To work with patterns use: \n\t$$ make pattern <pattern-name> <list | deploy | synth | destroy>"
@$ echo "Example:\n\t$$ make pattern single-new-eks-opensource-observability deploy \n\nPatterns: \n"
@$ $(foreach pattern, $(formatted_pattern_names), echo "\t$(pattern)";)

mkdocs:
mkdocs serve
mkdocs serve

# To supress the error after make command is run
# such as make: *** No rule to make target 'single-new-eks-awsnative-observability'. Stop.
pattern:
@echo $(pattern_name) performing $(pattern_command)
$(CDK) --app "npx ts-node bin/$(pattern_name).ts" $(if $(pattern_command),$(pattern_command), list)
$(CDK) --app "npx ts-node bin/$(BIN_NAME).ts" $(if $(pattern_command),$(pattern_command), list)
@:
%:
@:
Expand All @@ -50,7 +52,7 @@ test-all:
@for pattern in $(formatted_pattern_names) ; do \
echo "Building pattern $$pattern"; \
$(CDK) --app "npx ts-node bin/$$pattern.ts" list || exit 1 ;\
done
done

bootstrap:
@for LIB in $(HOMEBREW_LIBS) ; do \
Expand All @@ -61,8 +63,8 @@ bootstrap-cdk:
aws cloudformation describe-stacks \
--stack-name CDKToolkit \
--region ${AWS_REGION} || \
CDK_NEW_BOOTSTRAP=1 $(CDK) bootstrap
CDK_NEW_BOOTSTRAP=1 $(CDK) bootstrap

check-lib:
ifeq ($(shell brew ls --versions $(LIB)),)
@echo Installing $(LIB) via Hombrew
Expand Down
0 ...frastructure-Observability-Accelerator.ts → ....0/iac/bin/aws-o11y-solution-eks-infra.ts
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions solutions/oss/eks-infra/v2.0.0/iac/cdk.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@
"repoUrl": "https://github.com/aws-observability/observability-best-practices",
"name": "grafana-dashboards",
"targetRevision": "main",
"path": "./solutions/oss/eks-infra/v1.0.0/infrastructure"
"path": "./solutions/oss/eks-infra/v2.0.0/infrastructure"
},
"values": {
"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"
"GRAFANA_CLUSTER_DASH_URL" : "https://raw.githubusercontent.com/aws-observability/observability-best-practices/main/solutions/oss/eks-infra/v2.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/v2.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/v2.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/v2.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/v2.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/v2.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/v2.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/v2.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/v2.0.0/grafana-dashboards/apiserver/apiserver-troubleshooting.json"
},
"kustomizations": [
{
"kustomizationPath": "./solutions/oss/eks-infra/v1.0.0/infrastructure"
"kustomizationPath": "./solutions/oss/eks-infra/v2.0.0/infrastructure"
},
{
"kustomizationPath": "./solutions/oss/eks-infra/v1.0.0/apiserver"
"kustomizationPath": "./solutions/oss/eks-infra/v2.0.0/apiserver"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion ...2.0.0/iac/lib/existing-eks-opensource-observability-pattern/grafanaoperatorsecretaddon.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class GrafanaOperatorSecretAddon implements blueprints.ClusterAddOn {
{
secretKey: "GF_SECURITY_ADMIN_APIKEY",
remoteRef: {
key: "/eks-infra-monitoring-accelerator/grafana-api-key"
key: "/observability-aws-solution-eks-infra/grafana-api-key"
},
},
],
Expand Down
7 changes: 5 additions & 2 deletions ...tions/oss/eks-infra/v2.0.0/iac/lib/existing-eks-opensource-observability-pattern/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import * as iam from 'aws-cdk-lib/aws-iam';

export default class ExistingEksOpenSourceobservabilityPattern {
async buildAsync(scope: cdk.App, _id: string) {
const stackId = `EKS-Infrastructure-Observability-Accelerator`;
const clusterName = process.env.EKS_CLUSTER_NAME || "";
const stackId = `aws-observability-solution-eks-infra-${clusterName.replace("_", "-")}`;

const account = process.env.COA_ACCOUNT_ID! || process.env.CDK_DEFAULT_ACCOUNT!;
const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!;
Expand Down Expand Up @@ -90,7 +90,7 @@ export default class ExistingEksOpenSourceobservabilityPattern {
assumedBy: new iam.CompositePrincipal(
new iam.ServicePrincipal("eks.amazonaws.com"),
new iam.AccountPrincipal(account).withConditions(
{ StringLike: { 'aws:PrincipalArn': "arn:aws:iam::" + account + ":role/EKS-Infrastructure-Observ-*" } }
{ StringLike: { 'aws:PrincipalArn': "arn:aws:iam::" + account + ":role/aws-observability-solutio-*" } }
),
),
roleName: clusterRoleName,
Expand Down Expand Up @@ -133,6 +133,9 @@ export default class ExistingEksOpenSourceobservabilityPattern {
});

scraper.node.addDependency(obs)

cdk.Tags.of(obs.getClusterInfo().cluster.stack)
.add('o11y', "eks-infra-v" + utils.valueFromContext(scope, "solutionVersion", "2.0.0"));
}
}

Expand Down

0 comments on commit 928c62b

Please sign in to comment.