Commit 75252c12 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'lts' into develop

parents 6d4a31c3 5a4f87dc

.meepctl-repocfg.yaml

+106 −11
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.7.3

version: 1.7.4

repo:

  name: AdvantEDGE
@@ -91,6 +91,67 @@ repo: 
        # OAuth k8s secret (data: client-id, secret)

        secret: meep-oauth-gitlab



    # Metrics Configuration

    metrics:

      # Influx configuration

      influx:

        # enable influx data backups

        enabled: false

        # object store url

        url: my-object-store-fqdn

        # object store configuration secret

        secret: meep-influx-objstore-config

        # Number of days to retain daily data backups

        retention: 7

      # Prometheus configuration

      prometheus:

        # external labels added to prometheus metrics

        external-labels:

          # deployment region (geographic or logical)

          region: idcc

          # function being monitored

          monitor: advantedge

          # prometheus environment (dev|prod)

          promenv: prod

          # unique deployment identifier

          replica: platform-ip

      # Thanos long-term storage

      thanos:

        # enable Thanos

        enabled: false

        # object store configuration secret

        secret: meep-thanos-objstore-config

        # query component

        query:

          # enable querier

          enabled: true

        # query frontend component

        query-frontend:

          # enable query frontend

          enabled: true

        # store gateway component

        store-gateway:

          # enable store gateway

          enabled: true

        # compactor component

        compactor:

          # enable compactor

          enabled: false

          # data retention times

          retention:

            # raw data retention

            resolution-raw: 30d

            # 5m downsampled data retention

            resolution-5m: 60d

            # 1h downsampled data retention

            resolution-1h: 10y

      # Thanos long-term storage archive

      thanos-archive:

        # enable Thanos archive

        enabled: false

        # archive object store configuration secret

        secret: meep-thanos-archive-objstore-config



    # Default monitoring dashboards

    dashboards:

      network-metrics-point-to-point: dashboards/network-metrics-point-to-point.json
@@ -100,6 +161,7 @@ repo: 
      http-single-log: dashboards/http-log-byId.json

      http-logs-aggregation: dashboards/http-loggers.json

      platform-advantedge: dashboards/platform-advantedge.json

      # platform-advantedge: dashboards/platform-advantedge-thanos.json

      platform-k8s: dashboards/platform-k8s.json

      runtime-environment-node: dashboards/runtime-environment-node.json

      runtime-environment-k8s-cluster: dashboards/runtime-environment-k8s-cluster.json
@@ -676,7 +738,7 @@ repo: 
      chart: charts/influxdb

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-influxdb.yaml

    meep-kube-state-metrics:

    meep-ingress:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized
@@ -684,10 +746,10 @@ repo: 
      # enable meepctl deploy/delete

      deploy: true

      # location of deployment chart

      chart: charts/kube-state-metrics

      chart: charts/ingress-nginx

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-kube-state-metrics.yaml

    meep-ingress:

      chart-user-values: meep-ingress.yaml

    meep-kube-state-metrics:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized
@@ -695,20 +757,20 @@ repo: 
      # enable meepctl deploy/delete

      deploy: true

      # location of deployment chart

      chart: charts/ingress-nginx

      chart: charts/kube-state-metrics

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-ingress.yaml

    meep-redis:

      chart-user-values: meep-kube-state-metrics.yaml

    meep-minio:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: true

      deploy: false

      # location of deployment chart

      chart: charts/redis

      chart: charts/minio

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-redis.yaml

      chart-user-values: meep-minio.yaml

    meep-open-map-tiles:

      # enable meepctl build -> deps are never built

      build: false
@@ -742,6 +804,39 @@ repo: 
      chart: charts/kube-prometheus-stack

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-prometheus.yaml

    meep-redis:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: true

      # location of deployment chart

      chart: charts/redis

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-redis.yaml

    meep-thanos:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: false

      # location of deployment chart

      chart: charts/thanos

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-thanos.yaml

    meep-thanos-archive:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: false

      # location of deployment chart

      chart: charts/thanos

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-thanos-archive.yaml



  #------------------------------

  #  Packages

charts/grafana/dashboards/platform-advantedge-thanos.json

0 → 100644
+1082 −0

File added.

Preview size limit exceeded, changes collapsed.

charts/grafana/values.yaml

+8 −4
Original line number Diff line number Diff line
@@ -416,16 +416,20 @@ datasources: 
      url: http://meep-prometheus-prometheus:9090

      access: proxy

      isDefault: true

    - name: Thanos

      type: prometheus

      url: http://meep-thanos-query:9090

      access: proxy

      jsonData:

        customQueryParameters: "max_source_resolution=1h"

        disableMetricsLookup: true

    - name: meep-influxdb

      type: influxdb

      access: proxy

      database: _internal

      # user: grafana

      url: "http://meep-influxdb:8086"

      jsonData:

        timeInterval: "10s"

      # secureJsonData:

      #   password: grafana

 

## Configure notifiers

## ref: http://docs.grafana.org/administration/provisioning/#alert-notification-channels

charts/influxdb/templates/backup-cronjob.yaml

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ metadata: 
    {{- toYaml .Values.backup.annotations | nindent 4 }}

spec:

  schedule: {{ .Values.backup.schedule | quote }}

  successfulJobsHistoryLimit: 0

  failedJobsHistoryLimit: 0

  startingDeadlineSeconds: {{ .Values.backup.startingDeadlineSeconds }}

  concurrencyPolicy: Forbid

  jobTemplate:

charts/influxdb/templates/backup-retention-cronjob.yaml

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ metadata: 
    {{- toYaml .Values.backupRetention.annotations | nindent 4 }}

spec:

  schedule: {{ .Values.backupRetention.schedule | quote }}

  successfulJobsHistoryLimit: 0

  failedJobsHistoryLimit: 0

  startingDeadlineSeconds: {{ .Values.backupRetention.startingDeadlineSeconds }}

  concurrencyPolicy: Forbid

  jobTemplate: