Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/osclass] Add apache exporter #8850

Merged
merged 3 commits into from Oct 31, 2018
Merged

[stable/osclass] Add apache exporter #8850

merged 3 commits into from Oct 31, 2018

Conversation

javsalgar
Copy link
Collaborator

What this PR does / why we need it:

This PR adds an Apache exporter to be used with Prometheus.

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • DCO signed
  • Chart Version bumped
  • Variables are documented in the README.md

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>
@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 29, 2018
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 29, 2018
@@ -19,13 +19,26 @@ spec:
app: {{ template "osclass.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
{{- if or .Values.podAnnotations .Values.metrics.enabled }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podAnnotation is not defined in values.yaml (and values-production.yaml if it exists).

Can you add it and also include the new variable in the README?

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>
@helm-bot helm-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 30, 2018
Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>
@helm-bot helm-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 30, 2018
@carrodher
Copy link
Collaborator

/ok-to-test
/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 30, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carrodher, javsalgar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 30, 2018
@carrodher
Copy link
Collaborator

/retest

@k8s-ci-robot k8s-ci-robot merged commit 939dc5f into helm:master Oct 31, 2018
pmontanari pushed a commit to pmontanari/charts that referenced this pull request Nov 2, 2018
* [stable/osclass] Add apache exporter

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>

* [stable/osclass] Add podAnnotations

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>

* [stable/osclass] Add podAnnotations

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>
Signed-off-by: Patrick Montanari <patrick.montanari@gmail.com>
Jnig pushed a commit to Jnig/charts that referenced this pull request Nov 13, 2018
* [stable/osclass] Add apache exporter

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>

* [stable/osclass] Add podAnnotations

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>

* [stable/osclass] Add podAnnotations

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>
Signed-off-by: Jakob Niggel <info@jakobniggel.de>
wgiddens pushed a commit to wgiddens/charts that referenced this pull request Jan 18, 2019
* [stable/osclass] Add apache exporter

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>

* [stable/osclass] Add podAnnotations

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>

* [stable/osclass] Add podAnnotations

Signed-off-by: Javier J. Salmeron Garcia <jsalmeron@bitnami.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants