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

Merge pull request #198 from dilallkx/kd_sp05_dev_metrics 

Prometheus Scraping of new Auth Service metrics
parents c901e119 19955099

.meepctl-repocfg.yaml

+9 −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.4

version: 1.6.5

repo:

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

        secret: meep-oauth-gitlab



    # Default monitoring dashboards

    dashboards:

      network-metrics-point-to-point: dashboards/network-metrics-point-to-point.json

      network-metrics-aggregation: dashboards/network-metrics-aggregation.json

      http-single-log: dashboards/http-log-byId.json

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

      meep-node-exporter: dashboards/meep-node-exporter.json



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

  #  Resource Prerequisites

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

charts/grafana/dashboards/meep-node-exporter.json

0 → 100644
+13623 −0

File added.

Preview size limit exceeded, changes collapsed.

charts/grafana/values.yaml

+0 −8
Original line number Diff line number Diff line
@@ -471,14 +471,6 @@ dashboardProviders: 
##

dashboards:

  default:

    network-metrics-point-to-point:

      file: dashboards/network-metrics-point-to-point.json

    network-metrics-aggregation:

      file: dashboards/network-metrics-aggregation.json

    http-single-log:

      file: dashboards/http-log-byId.json

    http-logs-aggregation:

      file: dashboards/http-loggers.json

  #   some-dashboard:

  #     json: |

  #       $RAW_JSON

charts/meep-auth-svc/templates/deployment.yaml

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ spec: 
          ports:

            - containerPort: {{ .Values.deployment.port }}

              protocol: {{ .Values.deployment.protocol }}

          {{- if .Values.prometheus.monitor.enabled}}

            - name: metrics

              containerPort: {{ .Values.prometheus.monitor.port }}

              protocol: TCP

          {{- end}}

          env:

            {{- range $key, $value := .Values.image.env }}

            - name: {{ $key }}

charts/meep-auth-svc/templates/monitor.yaml

0 → 100644
+33 −0
Original line number Diff line number Diff line 
{{- if .Values.prometheus.monitor.enabled }}

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

  name: {{ template "meep-auth-svc.fullname" . }}

  namespace: {{ .Release.Namespace }}

  labels:

    app: {{ template "meep-auth-svc.name" . }}

    chart: {{ template "meep-auth-svc.chart" . }}

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

    meepOrigin: {{ .Values.meepOrigin }}

  {{- if .Values.prometheus.monitor.additionalLabels }}

{{ toYaml .Values.prometheus.monitor.additionalLabels | indent 4 }}

  {{- end }}

spec:

  selector:

    matchLabels:

      app: {{ template "meep-auth-svc.name" . }}

      release: {{ .Release.Name }}

  endpoints:

    - port: metrics

      {{- if .Values.prometheus.monitor.interval }}

      interval: {{ .Values.prometheus.monitor.interval }}

      {{- end }}

      {{- if .Values.prometheus.monitor.scrapeTimeout }}

      scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }}

      {{- end }}

{{- if .Values.prometheus.monitor.relabelings }}

      relabelings:

{{ toYaml .Values.prometheus.monitor.relabelings | indent 6 }}

{{- end }}

{{- end }}