Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat add monitoring to chart #358

Merged
merged 9 commits into from
Oct 18, 2023

Conversation

osamamagdy
Copy link

Add Prometheus and grafana to the chart

What kind of changes does this PR include?

  • A new feature
  • Additional documentation

Checklist:

  • All the contributions made are solely the work of me and my co-authors
  • I tested the changes in this PR (if applicable)
  • I added tests to ensure my change works (if applicable)
  • The PR passes pre-commit hooks and automated tests

osamamagdy and others added 4 commits September 22, 2023 17:19
Signed-off-by: osamamagdy <osamamagdy174@gmail.com>
Signed-off-by: osamamagdy <osamamagdy174@gmail.com>
Signed-off-by: osamamagdy <osamamagdy174@gmail.com>
@@ -195,7 +178,7 @@ wrongsecrets:
# -- Optional environment variables to set for each Wrongsecrets instance (see: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/)
env:
- name: K8S_ENV
value: k8s
value: gcp
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Edited

@@ -94,7 +94,7 @@ balancer:
REACT_APP_S3_BUCKET_URL: "s3://funstuff" #the s3 bucket you use for the aws challenges, don't forget to make it accessible!
REACT_APP_GCP_BUCKET_URL: "gs://funstuff" #the gcp bucket you use for the gcp challenges, don't forget to make it accessible!
REACT_APP_AZ_BLOB_URL: "az://funstuff" #the azure blob storage you use for the azure challenges, don't forget to make it accessible!
K8S_ENV: "k8s" #or 'aws', 'azure', or 'gcp'
K8S_ENV: "gcp" #or 'aws', 'azure', or 'gcp'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change intended?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it was not sorry for that

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Edited

@@ -170,7 +153,7 @@ wrongsecrets:
# -- Specify a custom Wrongsecrets config.yaml. See the Wrongsecrets Docs for any needed ENVs: https://github.com/OWASP/wrongsecrets
# @default -- See values.yaml for full details
config: |
K8S_ENV: k8s
K8S_ENV: gcp
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Edited

@osamamagdy osamamagdy requested a review from bendehaan October 6, 2023 08:56
const { get, extractTeamName } = require('./config');
const { logger } = require('./logger');

const app = express();

if (get('metrics.enabled')) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why delete the metrics endpoint and config from the balancer?

@commjoen commjoen merged commit 761df99 into OWASP:main Oct 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants