Unverified Commit dcccd760 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #260 from dilallkx/kd_sp23_lts 

Long-term storage: Thanos + MinIO
parents 77112896 7b782e03

.meepctl-repocfg.yaml

+96 −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.1

version: 1.7.2

repo:

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

        secret: meep-oauth-gitlab



    # Metrics Configuration

    metrics:

      # Prometheus configuration

      prometheus:

        # external labels added to prometheus metrics

        external-labels:

          # geographic region where

          region: my-city

          # function being monitored

          monitor: platform

          # prometheus environment (dev|prod)

          promenv: prod

          # unique deployment identifier

          replica: my-platform-fqdn

      # 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: 30d

            # 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
@@ -98,6 +149,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
@@ -633,7 +685,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
@@ -641,10 +693,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
@@ -652,20 +704,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
@@ -699,6 +751,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/kube-prometheus-stack/values.yaml

+21 −3
Original line number Diff line number Diff line
@@ -1660,7 +1660,11 @@ prometheus: 


    ## External labels to add to any time series or alerts when communicating with external systems

    ##

    externalLabels: {}

    # externalLabels:

    #   region:

    #   monitor: 

    #   promenv:

    #   replica:



    ## Name of the external label used to denote replica name

    ##
@@ -2095,11 +2099,25 @@ prometheus: 
    ## This is experimental and may change significantly without backward compatibility in any release.

    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#thanosspec

    ##

    thanos: {}

    # thanos:

    #   # image: quay.io/thanos/thanos

    #   # version: v0.8.1

    #   objectStorageConfig:

    #     key: objstore.yml

    #     name: meep-objstore-config



    ## Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod.

    ##  if using proxy extraContainer  update targetPort with proxy container port

    containers: []

    # containers: []

    # containers:

    #   - name: thanos-sidecar

    #     args:

    #       - "sidecar"

    #       - "--shipper.upload-compacted"

    #       - "--objstore.config=$(OBJSTORE_CONFIG)"

    #       - "--tsdb.path=/prometheus"

    #       - "--log.level=info"

    #       - "--log.format=logfmt"



    ## InitContainers allows injecting additional initContainers. This is meant to allow doing some changes

    ## (permissions, dir tree) on mounted volumes before starting prometheus

charts/minio/.helmignore

0 → 100644
+23 −0
Original line number Diff line number Diff line 
# Patterns to ignore when building packages.

# This supports shell glob matching, relative path matching, and

# negation (prefixed with !). Only one pattern per line.

.DS_Store

# Common VCS dirs

.git/

.gitignore

.bzr/

.bzrignore

.hg/

.hgignore

.svn/

# Common backup files

*.swp

*.bak

*.tmp

*~

# Various IDEs

.project

.idea/

*.tmproj

# OWNERS file for Kubernetes

OWNERS
 
 No newline at end of file