Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add graphitePort, graphiteDelimiters and graphiteFormat to proxy options. #262

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions wavefront/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ The following tables lists the configurable parameters of the Wavefront chart an
| `proxy.histogramHourPort` | Port to accumulate 1-hour based histograms on Wavefront data format (usually 40002) | `nil` |
| `proxy.histogramDayPort` | Port to accumulate 1-day based histograms on Wavefront data format (usually 40003) | `nil` |
| `proxy.deltaCounterPort` | Port to accumulate 1-minute delta counters on Wavefront data format (usually 50000) | `nil` |
| `proxy.graphitePort` | Port for metrics in Graphite data format (usually 2003) | `nil` |
| `proxy.graphiteDelimiters` | Characters that should be replaced by dots in Graphite data. | `nil` |
| `proxy.graphiteFormat` | Indexes of fields within Graphite and collectd metric names that correspond to a hostname. | `nil` |
| `proxy.args` | Additional Wavefront proxy properties to be passed as command line arguments in the `--<property_name> <value>` format. Multiple properties can be specified. [See more](https://docs.wavefront.com/proxies_configuring.html) | `nil` |
| `proxy.heap` | Wavefront proxy Java heap maximum usage (java -Xmx command line option) | `nil` |
| `proxy.preprocessor.rules.yaml` | YAML configuraiton for Wavefront proxy preprocessor rules. [See more](https://docs.wavefront.com/proxies_preprocessor_rules.html) | `nil` |
Expand Down
7 changes: 7 additions & 0 deletions wavefront/templates/proxy-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ spec:
{{- if .Values.proxy.httpProxyPort }} --proxyPort {{ .Values.proxy.httpProxyPort }}{{- end -}}
{{- if .Values.proxy.httpProxyUser }} --proxyUser {{ .Values.proxy.httpProxyUser }}{{- end -}}
{{- if .Values.proxy.httpProxyPassword }} --proxyPassword {{ .Values.proxy.httpProxyPassword }}{{- end -}}
{{- if .Values.proxy.graphitePort }} --graphitePorts {{ .Values.proxy.graphitePort }}{{- end -}}
{{- if .Values.proxy.graphiteDelimiters }} --graphiteDelimiters {{ .Values.proxy.graphiteDelimiters }}{{- end -}}
{{- if .Values.proxy.graphiteFormat }} --graphiteFormat {{ .Values.proxy.graphiteFormat }}{{- end -}}
{{- if .Values.proxy.heap }}
- name: JAVA_HEAP_USAGE
value: {{ .Values.proxy.heap | quote }}
Expand Down Expand Up @@ -104,6 +107,10 @@ spec:
- containerPort: {{ .Values.proxy.deltaCounterPort }}
protocol: TCP
{{- end }}
{{- if .Values.proxy.graphitePort }}
- containerPort: {{ .Values.proxy.graphitePort }}
protocol: TCP
{{- end }}
resources:
{{ toYaml .Values.proxy.resources | trim | indent 10 }}
securityContext:
Expand Down
5 changes: 5 additions & 0 deletions wavefront/templates/proxy-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ spec:
port: {{ .Values.proxy.deltaCounterPort }}
protocol: TCP
{{- end }}
{{- if .Values.proxy.graphitePort }}
- name: graphite
port: {{ .Values.proxy.graphitePort }}
protocol: TCP
{{- end }}
selector:
app.kubernetes.io/name : {{ template "wavefront.fullname" .}}
app.kubernetes.io/component: proxy
Expand Down
11 changes: 11 additions & 0 deletions wavefront/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,17 @@ proxy:
## This is usually 50000
# deltaCounterPort: 50000

## The port number the proxy will listen on for metrics in Graphite data format.
## This is usually 2003
# graphitePort: 2003

## Characters that should be replaced by dots, in case they were escaped within Graphite and collectd before sending.
## A common delimiter is underscore
# graphiteDelimiters: _

## Indexes of fields within Graphite and collectd metric names that correspond to a hostname.
# graphiteFormat: 4,2,5

## Any configuration property can be passed to the proxy via command line args in
## in the format: `--<property_name> <value>`. Multiple properties can be specified
## separated by whitespace.
Expand Down