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

Merge pull request #191 from nikhildoifode/na-1176-77 

Added Prometheus monitoring and enabled metrics collection for dependencies
parents 517e0b29 c9481cfa

.meepctl-repocfg.yaml

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

version: 1.6.3

repo:

  name: AdvantEDGE
@@ -163,6 +163,7 @@ repo: 
          - meep-open-map-tiles

          - meep-postgis

          - meep-redis

          # - meep-prometheus

        # list of platform pods to monitor

        core-pods:

          - meep-mon-engine
@@ -656,6 +657,19 @@ repo: 
      chart: charts/postgis

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

      chart-user-values: meep-postgis.yaml

    meep-prometheus:

      # Priority 1 is highest to make sure Prometheus is deployed first

      priority: 1

      # 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/kube-prometheus-stack

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

      chart-user-values: meep-prometheus.yaml



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

  #  Packages

charts/cert-manager/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ ingressShim: {} 
prometheus:

  enabled: true

  servicemonitor:

    enabled: false

    enabled: true

    prometheusInstance: default

    targetPort: 9402

    path: /metrics

charts/grafana/templates/servicemonitor.yaml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{{- if .Values.grafana.serviceMonitor.selfMonitor }}

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

  name: {{ template "grafana.fullname" . }}

  namespace: {{ template "grafana.namespace" . }}

  labels:

    app: {{ template "grafana.name" . }}

    chart: {{ template "grafana.chart" . }}

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

spec:

  jobLabel: {{ .Values.grafana.jobLabel }}

  selector:

    matchLabels:

      app: grafana

      release: {{ .Release.Name }}

  endpoints:

  - port: {{ .Values.grafana.service.portName }}

    {{- if .Values.grafana.serviceMonitor.interval }}

    interval: {{ .Values.grafana.serviceMonitor.interval }}

    {{- end }}

    path: {{ .Values.grafana.serviceMonitor.path | quote }}

{{- if .Values.grafana.serviceMonitor.metricRelabelings }}

    metricRelabelings:

{{ tpl (toYaml .Values.grafana.serviceMonitor.metricRelabelings | indent 6) . }}

{{- end }}

{{- if .Values.grafana.serviceMonitor.relabelings }}

    relabelings:

{{ toYaml .Values.grafana.serviceMonitor.relabelings | indent 6 }}

{{- end }}

{{- end }}

charts/grafana/values.yaml

+40 −5
Original line number Diff line number Diff line
@@ -314,11 +314,11 @@ datasources: 
  datasources.yaml:

    apiVersion: 1

    datasources:

#    - name: Prometheus

#      type: prometheus

#      url: http://prometheus-prometheus-server

#      access: proxy

#      isDefault: true

    - name: Prometheus

      type: prometheus

      url: http://meep-prometheus-prometheus:9090

      access: proxy

      isDefault: true

    - name: meep-influxdb

      type: influxdb

      access: proxy
@@ -536,3 +536,38 @@ sidecar: 
## Override the deployment namespace

##

namespaceOverride: ""



grafana:

  jobLabel: jobLabel



  service:

    portName: service



  ## If true, create a serviceMonitor for grafana

  ##

  serviceMonitor:

    ## Scrape interval. If not set, the Prometheus default scrape interval is used.

    ##

    interval: ""

    selfMonitor: true



    # Path to use for scraping metrics. Might be different if server.root_url is set

    # in grafana.ini

    path: "/metrics"



    ## 	metric relabel configs to apply to samples before ingestion.

    ##

    metricRelabelings: []

    # - action: keep

    #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'

    #   sourceLabels: [__name__]



    # 	relabel configs to apply to samples before ingestion.

    ##

    relabelings: []

    # - sourceLabels: [__meta_kubernetes_pod_node_name]

    #   separator: ;

    #   regex: ^(.*)$

    #   targetLabel: nodename

    #   replacement: $1

    #   action: replace
 
 No newline at end of file

charts/kube-prometheus-stack/.helmignore

0 → 100644
+26 −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

# helm/charts

OWNERS

hack/

ci/

kube-prometheus-*.tgz