Skip to content

Commit

Permalink
Merge pull request #7 from dynatrace-oss/eks_blueprint_changes
Browse files Browse the repository at this point in the history
feat: change naming to eks blueprints
  • Loading branch information
thschue authored Mar 31, 2022
2 parents 2641de4 + 0a30a57 commit 8b24fff
Show file tree
Hide file tree
Showing 7 changed files with 7,867 additions and 15,835 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dependencies-and-licenses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Checkout Core Repo
uses: actions/checkout@v2.4.0
with:
path: 'dynatrace-oss/dynatrace-ssp-addon'
path: 'dynatrace-oss/dynatrace-eks-blueprints-addon'
- name: Set up Node
uses: actions/setup-node@v2.5.0
with:
Expand All @@ -22,7 +22,7 @@ jobs:
- name: Node dependencies and licenses
run: |
echo "🔍 Analyzing dependencies in documentation"
( cd dynatrace-oss/dynatrace-ssp-addon/addon || return ; license-report --only-prod --output=csv > ../../../dependencies-and-licenses-node.txt )
( cd dynatrace-oss/dynatrace-eks-blueprints-addon/addon || return ; license-report --only-prod --output=csv > ../../../dependencies-and-licenses-node.txt )
echo
echo "👍 done. written results to ./dependencies-and-licenses-node.txt"
cat dependencies-and-licenses-node.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Checkout Core Repo
uses: actions/checkout@v2.4.0
with:
path: 'keptn-sandbox/keptn-ssp-addons'
path: 'dynatrace-oss/dynatrace-eks-blueprints-addons'
- name: Set up Node
uses: actions/setup-node@v2.5.0
with:
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Node dependencies and licenses
run: |
echo "🔍 Analyzing dependencies in documentation"
( cd dynatrace-oss/dynatrace-ssp-addon/addon || return ; license-report --only-prod --output=csv > ../../../dependencies-and-licenses-node.txt )
( cd dynatrace-oss/dynatrace-eks-blueprints-addon/addon || return ; license-report --only-prod --output=csv > ../../../dependencies-and-licenses-node.txt )
echo
echo "👍 done. written results to ./dependencies-and-licenses-node.txt"
cat dependencies-and-licenses-node.txt
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dynatrace Add-On for the Amazon Shared Services Platform
[![main](https://github.com/dynatrace-oss/dynatrace-ssp-addon/actions/workflows/main.yml/badge.svg)](https://github.com/dynatrace-oss/dynatrace-ssp-addon/actions/workflows/main.yml)
# Dynatrace Add-On for Amazon EKS Blueprints
[![main](https://github.com/dynatrace-oss/dynatrace-eks-blueprints-addon/actions/workflows/main.yml/badge.svg)](https://github.com/dynatrace-oss/dynatrace-eks-blueprints-addon/actions/workflows/main.yml)

The Dynatrace Add-On for the Amazon Shared Services Platform enables platform administrators to install the Dynatrace OneAgent Operator during the bootstrapping process of an [EKS](https://aws.amazon.com/eks/) cluster.
The Dynatrace Add-On for Amazon EKS Blueprints enables platform administrators to install the Dynatrace OneAgent Operator during the bootstrapping process of an [EKS](https://aws.amazon.com/eks/) cluster.

Therefore, this add-on installs the [Dynatrace Operator Helm Chart](https://github.com/Dynatrace/helm-charts/tree/master/dynatrace-operator) and configures the operator to use a Dynatrace Tenant with credentials specified by variables or a Amazon Secrets Manager Secret.

Expand All @@ -27,14 +27,14 @@ Therefore:
## Usage
The add-on can be used by either specifying the name of a Secrets Manager secret or the API Tokens.

You can find informations how to get started with SSP Projects [here](https://aws-quickstart.github.io/ssp-amazon-eks/getting-started/).
You can find informations how to get started with SSP Projects [here](https://aws-quickstart.github.io/cdk-eks-blueprints/getting-started/).

### Example Configuration (secrets in Secrets Manager):
```typescript
import 'source-map-support/register';
import * as cdk from '@aws-cdk/core'
import * as dt from '@dynatrace/dynatrace-ssp-addon'
import * as ssp from '@aws-quickstart/ssp-amazon-eks'
import * as dt from '@dynatrace/dynatrace-eks-blueprints-addon'
import * as blueprints from '@aws-quickstart/eks-blueprints'

const app = new cdk.App();

Expand All @@ -44,23 +44,23 @@ const Dynatrace = new dt.DynatraceOperatorAddOn({
})


const addOns: Array<ssp.ClusterAddOn> = [
const addOns: Array<blueprints.ClusterAddOn> = [
Dynatrace,
];

const account = '<aws-account-id>';
const region = '<aws-region>';
const props = { env: { account, region } };
new ssp.EksBlueprint(app, { id: '<aws-eks-cluster-name>', addOns}, props);
new blueprints.EksBlueprint(app, { id: '<aws-eks-cluster-name>', addOns}, props);
```

### Example Configuration (secrets in code):

```typescript
import 'source-map-support/register';
import * as cdk from '@aws-cdk/core'
import * as dt from '@dynatraceoss/dynatrace-ssp-addon'
import * as ssp from '@aws-quickstart/ssp-amazon-eks'
import * as dt from '@dynatraceoss/dynatrace-eks-blueprints-addon'
import * as blueprints from '@aws-quickstart/eks-blueprints'

const app = new cdk.App();

Expand All @@ -71,14 +71,14 @@ const Dynatrace = new dt.DynatraceAddOn({
})


const addOns: Array<ssp.ClusterAddOn> = [
const addOns: Array<blueprints.ClusterAddOn> = [
Dynatrace,
];

const account = '<aws-account-id>';
const region = '<aws-region>';
const props = { env: { account, region } };
new ssp.EksBlueprint(app, { id: '<aws-eks-cluster-name>', addOns}, props);
new blueprints.EksBlueprint(app, { id: '<aws-eks-cluster-name>', addOns}, props);
```

## Adding your EKS Cluster to Dynatrace
Expand Down
1 change: 1 addition & 0 deletions addon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ deps:
npm install

build:
npm install
npm run build

clean:
Expand Down
Loading

0 comments on commit 8b24fff

Please sign in to comment.