UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects

Issue 685 service monitor gatekeeper

Closed Ronnie Webb requested to merge issue-685-service-monitor-gatekeeper into main
7 unresolved threads

Merge request reports

Merge request pipeline #542339 passed

Merge request pipeline passed for 704c7050

Requires 1 approval from eligible users.

Closed by Ryan GarciaRyan Garcia 2 years ago (Sep 13, 2022 5:50pm UTC)

Merge details

  • The changes were not merged into main.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
53 {{- if .Values.dashboards }}
54 download_dashboards.sh: |
55 #!/usr/bin/env sh
56 set -euf
57 {{- if .Values.dashboardProviders }}
58 {{- range $key, $value := .Values.dashboardProviders }}
59 {{- range $value.providers }}
60 mkdir -p {{ .options.path }}
61 {{- end }}
62 {{- end }}
63 {{- end }}
64
65 {{- range $provider, $dashboards := .Values.dashboards }}
66 {{- range $key, $value := $dashboards }}
67 {{- if (or (hasKey $value "gnetId") (hasKey $value "url")) }}
68 curl -skf \
  • 1 {{- if .Values.gatekeeper.enabled }}
    2 apiVersion: v1
    3 kind: Service
    4 metadata:
    5 creationTimestamp: null
    6 labels:
    7 app: monitoring-gatekeeper-exporter
    8 name: opa-exporter
    • Shouldn't this service object be in the ClusterAuditor project?

    • I found that if the service and exporter and scrape aren't deployed at the same time there were issues with prometheus opa-exporter target coming up. I also feel its cleaner to just put everything in monitoring.

    • Exporters should be kept with the package it is exporting since we don't necessarily have to have the monitoring package installed to scrape them. For example, I could set monitoring to true in cluster auditor and NOT deploy the Prometheus/Grafana stack, and use Amazon CloudWatch (or another tool) to scrape the metrics instead. So, I think it is a must have for the exporter to go into the cluster-auditor package.

    • changed this line in version 3 of the diff

    • Please register or sign in to reply
  • 1 {{- if .Values.gatekeeper.enabled }}
  • 690 693 ##
    691 694 defaultDashboardsEnabled: true
    692 695
    693
    696 plugins:
    697 - grafana-piechart-panel
  • Ronnie Webb added 1 commit

    added 1 commit

    • e84c8721 - removing configmap and plugin declaration

    Compare with previous version

  • 56 56 port: ""
    57 57 namespace: ""
    58 58
    59 gatekeeper:
    60 enabled: true
  • 2362 2364 ## The scrape configuration example below will find master nodes, provided they have the name .*mst.*, relabel the
    2363 2365 ## port to 2379 and allow etcd scraping provided it is running on all Kubernetes master nodes
    2364 2366 ##
    2365 additionalScrapeConfigs: []
    2367 additionalScrapeConfigs:
    2368 - job_name: opa-exporter
    2369 kubernetes_sd_configs:
    2370 - role: service
    2371 namespaces:
    2372 names:
    2373 - monitoring
    2374 selectors:
    2375 - role: service
    2376 label: "app=monitoring-gatekeeper-exporter"
  • 1 {{- if .Values.gatekeeper.enabled }}
    2 apiVersion: apps/v1
    3 kind: Deployment
    4 metadata:
    5 creationTimestamp: null
  • Ronnie Webb added 1 commit

    added 1 commit

    Compare with previous version

  • Ronnie Webb added 1 commit

    added 1 commit

    Compare with previous version

  • Ronnie Webb added 1 commit

    added 1 commit

    Compare with previous version

  • moving back to doing, to rebase and resolve merge conflicts.

    @ronwebb , can you rebase with origin/main and resolve any merge conflicts? Also, if you addressed the unresolved threads, can you mark those threads resolved by clicking the "Resolve thread" button? Thanks!

    Edited by Michael Martin
  • Michael Martin added statusdoing label and removed statusreview label

    added statusdoing label and removed statusreview label

  • @ronwebb this merge request has been inactive for 30 days is being marked as stale, no-auto-close, pre-gitlab-triage, and needs-attention before implementation of new gitlab-triage policies take effect. If this merge request is still required please take action and leave a comment with justication to stay open. If this merge request is not required please remove the label no-auto-close add the label, marked-for-auto-close.

  • @ronwebb This merge request is not marked as draft, if it is ready for review please add the label, statusreview.

  • closed

  • Please register or sign in to reply
    Loading