Commit 598d1b0b authored by Dimitrios Giannopoulos's avatar Dimitrios Giannopoulos
Browse files

feat: revert prometheus/grafana changes

parent f554a964

kubernetes/helm/openslice/Chart.yaml

+0 −11
Original line number Original line Diff line number Diff line
@@ -21,14 +21,3 @@ version: 2.0.0 
# incremented each time you make changes to the application. Versions are not expected to

# incremented each time you make changes to the application. Versions are not expected to

# follow Semantic Versioning. They should reflect the version the application is using.

# follow Semantic Versioning. They should reflect the version the application is using.

appVersion: 2025Q2-SNAPSHOT
 
appVersion: 2025Q2-SNAPSHOT
 


dependencies:

  - name: grafana

    version: "8.11.4"

    repository: "https://grafana.github.io/helm-charts"

    condition: grafana.enabled

  - name: prometheus

    version: "27.8.0"

    repository: "https://prometheus-community.github.io/helm-charts"

    condition: prometheus.enabled

kubernetes/helm/openslice/values.yaml

+1 −58
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ spring: 
  oauthClientSecret: secret

  oauthClientSecret: secret





mysql:

mysql:

  storage: 100Mi

  storage: 10Gi





metrico:

metrico:

  enabled: true

  enabled: true
@@ -271,65 +271,8 @@ ingress: 
  - path: "/"

  - path: "/"

    service: "tmfweb"

    service: "tmfweb"

    port: 80

    port: 80

  - path: "/grafana(/|$)(.*)"

    service: "grafana"

    port: 80

  - path: "/prometheus(/|$)(.*)"

    service: "prometheus-server"

    port: 80

  annotations: {}

  annotations: {}





## Using default values from https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus

##

prometheus:

  enabled: true



  alertmanager:

    enabled: false



  kube-state-metrics:

    enabled: false



  prometheus-node-exporter:

    enabled: false



  prometheus-pushgateway:

    enabled: false



  commonMetaLabels:

    app: openslice



  server:

    prefixURL: "/prometheus"



    ingress:

      enabled: false



    persistentVolume:

      enabled: false



    podAnnotations:

      prometheus.io/scrape: "true"

      prometheus.io/path: /metrics

      prometheus.io/port: "9090"



## Using default values from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml

##

grafana:

  enabled: true

  adminPassword: admin



  testFramework:

    enabled: false   # Disable test pod



  grafana.ini:

    server:

      root_url: "%(protocol)s://%(domain)s/grafana"

      serve_from_sub_path: true



  extraLabels:

    app: openslice



resources: {}

resources: {}

  # We usually recommend not to specify default resources and to leave this as a conscious

  # We usually recommend not to specify default resources and to leave this as a conscious

  # choice for the user. This also increases chances charts run on environments with little

  # choice for the user. This also increases chances charts run on environments with little