Skip to content

Commit

Permalink
feat: remove shortcuts (#1637)
Browse files Browse the repository at this point in the history
  • Loading branch information
dennisvankekem authored Jul 9, 2024
1 parent 57e23fd commit 096d9a1
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 33 deletions.
15 changes: 0 additions & 15 deletions core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,6 @@ adminApps:
- authorization
type: public
auth: true
shortcuts:
- title: NGINX
description: NGINX ingress controller metrics
path: /d/nginx/nginx-ingress-controller?orgId=1&refresh=5s
- name: harbor
tags: [security]
isShared: true
Expand Down Expand Up @@ -252,10 +248,6 @@ adminApps:
svc: keycloak-service
type: public
port: 8080
shortcuts:
- title: Account
description: Edit your account settings.
path: /realms/otomi/account/
- name: kiali
tags: [tracing, telemetry, observability]
deps: [istio, prometheus]
Expand Down Expand Up @@ -290,13 +282,6 @@ adminApps:
deps: [grafana, prometheus, minio]
useHost: grafana
path: /explore?orgId=1&left=%7B"datasource":"loki","queries":%5B%7B"refId":"A"%7D%5D,"range":%7B"from":"now-1h","to":"now"%7D%7D
shortcuts:
- title: Ingress logs
description: All logs generated in the "ingress" namespace
path: /explore?orgId=1&left=%5B"now-1h","now","Loki",%7B"expr":"%7Bnamespace%3D%5C"ingress%5C"%7D","refId":"A"%7D%5D
- title: OWASP violations
description: All OWASP rule violations
path: /explore?orgId=1&left=%5B"now-1h","now","Loki",%7B"expr":"%7Bnamespace%3D%5C"ingress%5C"%7D%20%7C%3D%5C"ModSecurity:%20%5C""%7D%5D
- name: minio
tags: [storage, backup]
ownHost: true
Expand Down
2 changes: 1 addition & 1 deletion helmfile.d/snippets/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ environments:
upgrade:
version: main
# TODO: update this when schema version changes: (and think more?)
version: 22
version: 24
letsencryptRootCA: |
-----BEGIN CERTIFICATE-----
MIIFmDCCA4CgAwIBAgIQU9C87nMpOIFKYpfvOHFHFDANBgkqhkiG9w0BAQsFADBm
Expand Down
26 changes: 26 additions & 0 deletions values-changes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -225,3 +225,29 @@ changes:
- 'kms.sops.vault'
- 'platformBackups.persistentVolumes.vault'
- 'apps.exteral-secrets'
- version: 24
deletions:
- 'teamConfig.{team}.apps.alertmanager.shortcuts'
- 'teamConfig.{team}.apps.argocd.shortcuts'
- 'teamConfig.{team}.apps.cert-manager.shortcuts'
- 'teamConfig.{team}.apps.cnpg.shortcuts'
- 'teamConfig.{team}.apps.drone.shortcuts'
- 'teamConfig.{team}.apps.external-dns.shortcuts'
- 'teamConfig.{team}.apps.falco.shortcuts'
- 'teamConfig.{team}.apps.gitea.shortcuts'
- 'teamConfig.{team}.apps.grafana.shortcuts'
- 'teamConfig.{team}.apps.harbor.shortcuts'
- 'teamConfig.{team}.apps.httpbin.shortcuts'
- 'teamConfig.{team}.apps.ingress-nginx.shortcuts'
- 'teamConfig.{team}.apps.istio.shortcuts'
- 'teamConfig.{team}.apps.jaeger.shortcuts'
- 'teamConfig.{team}.apps.keycloak.shortcuts'
- 'teamConfig.{team}.apps.kiali.shortcuts'
- 'teamConfig.{team}.apps.knative.shortcuts'
- 'teamConfig.{team}.apps.kured.shortcuts'
- 'teamConfig.{team}.apps.loki.shortcuts'
- 'teamConfig.{team}.apps.minio.shortcuts'
- 'teamConfig.{team}.apps.prometheus.shortcuts'
- 'teamConfig.{team}.apps.rabbitmq.shortcuts'
- 'teamConfig.{team}.apps.sealed-secrets.shortcuts'
- 'teamConfig.{team}.apps.tempo.shortcuts'
17 changes: 0 additions & 17 deletions values-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -790,20 +790,6 @@ definitions:
- limits
- requests
title: Pod resources
shortcuts:
type: array
items:
additionalProperties: false
properties:
title:
type: string
description: Title for the shortcut
description:
type: string
description: A short description about the target of this shortcut.
path:
$ref: '#/definitions/path'
type: object
unixOwnerIdRange:
type: object
additionalProperties: false
Expand Down Expand Up @@ -1131,9 +1117,6 @@ definitions:
$ref: '#/definitions/alerts'
apps:
type: object
properties:
shortcuts:
$ref: '#/definitions/shortcuts'
backups:
type: array
items:
Expand Down

0 comments on commit 096d9a1

Please sign in to comment.