SC-4103 Update custom URL variables and other improvments (#12401)

Signed-off-by: Alen Komljen <alen.komljen@live.com>
This commit is contained in:
Alen Komljen
2019-03-20 08:08:59 -07:00
committed by Kubernetes Prow Robot
parent a9dcb48bd7
commit 456f4a61e0
9 changed files with 45 additions and 21 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
appVersion: "1.0"
version: 1.0.2
version: 1.0.3
description: Helm chart for deploying Sematext Agent to Kubernetes
keywords:
- sematext
+5 -5
View File
@@ -17,7 +17,7 @@ To install the chart run the following command:
```bash
$ helm install --name release_name \
--set containerToken=YOUR_CONTAINER_TOKEN,logsToken=YOUR_LOGS_TOKEN stable/sematext-agent
--set containerToken=YOUR_CONTAINER_TOKEN,logseneToken=YOUR_LOGS_TOKEN stable/sematext-agent
```
After a few minutes, you should see logs, metrics, and events reported in Sematext web UI.
@@ -41,7 +41,7 @@ The following table lists the configuration parameters of the `sematext-agent` c
| Parameter | Description | Default |
|-------------------------------|--------------------------------------|-------------------------------------------|
| `containerToken` | Sematext Container token | `Nil` Provide your Container token |
| `logsToken` | Sematext Logs token | `Nil` Provide your Logs token |
| `logseneToken` | Sematext Logsene token | `Nil` Provide your Logsene token |
| `region` | Sematext region | `US` Sematext US or EU region |
| `agent.image.repository` | The image repository | `sematext/agent` |
| `agent.image.tag` | The image tag | `latest` |
@@ -53,9 +53,9 @@ The following table lists the configuration parameters of the `sematext-agent` c
| `logagent.image.tag` | The image tag | `latest` |
| `logagent.image.pullPolicy` | Image pull policy | `Always` |
| `logagent.resources` | Logagent resources | `{}` |
| `customUrl.metricsServer` | Custom endpoint for Metrics receiver | `Nil` |
| `customUrl.logsServer` | Custom endpoint for Logs receiver | `Nil` |
| `customUrl.eventServer` | Custom endpoint for Event receiver | `Nil` |
| `customUrl.serverBaseUrl` | Custom Base URL | `Nil` |
| `customUrl.logsReceiverUrl` | Custom Logsene receiver URL | `Nil` |
| `customUrl.eventsRecieverUrl` | Custom Event receiver URL | `Nil` |
| `serviceAccount.create` | Create a service account | `true` |
| `serviceAccount.name` | Service account name | `Nil` Defaults to chart name |
| `rbac.create` | RBAC enabled | `true` |
+5 -5
View File
@@ -1,7 +1,7 @@
{{- if and (not .Values.containerToken) (not .Values.logsToken) -}}
{{- if and (not .Values.containerToken) (not .Values.logseneToken) -}}
###############################################################################
# ERROR: Please provide containerToken and/or logsToken! #
# ERROR: Please provide containerToken and/or logseneToken! #
###############################################################################
Depending on which region you want to use, create a container and/or logs apps
@@ -14,14 +14,14 @@ helm install --name release_name \
Or if you created both apps use:
helm install --name release_name \
--set containerToken=YOUR_CONTAINER_TOKEN,logsToken=YOUR_LOGS_TOKEN \
--set containerToken=YOUR_CONTAINER_TOKEN,logseneToken=YOUR_LOGS_TOKEN \
stable/sematext-agent
Please check the README file for all available parameters.
{{- else if not .Values.logsToken -}}
{{- else if not .Values.logseneToken -}}
Missing logsToken! You will only receive metrics and events.
Missing logseneToken! You will only receive metrics and events.
{{ if eq .Values.region "US" }}
After a few minutes check your app at https://apps.sematext.com/ui/monitoring
{{ else if eq .Values.region "EU" }}
@@ -21,6 +21,12 @@ rules:
- list
- get
- watch
- apiGroups:
- ""
resources:
- nodes/metrics
verbs:
- get
- apiGroups:
- ""
resources:
@@ -37,4 +43,12 @@ rules:
verbs:
- watch
- list
- apiGroups:
- extensions
resources:
- replicasets
verbs:
- get
- watch
- list
{{- end }}
@@ -13,9 +13,9 @@ data:
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.customUrl }}
SERVER_BASE_URL: {{ default "" .Values.customUrl.metricsServer | quote }}
EVENTS_RECEIVER_URL: {{ default "" .Values.customUrl.eventServer | quote }}
LOGS_RECEIVER_URL: {{ default "" .Values.customUrl.logsServer | quote }}
SERVER_BASE_URL: {{ default "" .Values.customUrl.serverBaseUrl | quote }}
EVENTS_RECEIVER_URL: {{ default "" .Values.customUrl.eventsRecieverUrl | quote }}
LOGS_RECEIVER_URL: {{ default "" .Values.customUrl.logsReceiverUrl | quote }}
{{- else if eq .Values.region "EU" }}
SERVER_BASE_URL: "https://spm-receiver.eu.sematext.com"
EVENTS_RECEIVER_URL: "https://event-receiver.eu.sematext.com"
@@ -13,5 +13,5 @@ data:
{{ $key }}: {{ $val | quote }}
{{- end }}
{{- if .Values.customUrl }}
LOGS_RECEIVER_URL: {{ default "" .Values.customUrl.logsServer | quote }}
LOGS_RECEIVER_URL: {{ default "" .Values.customUrl.logsReceiverUrl | quote }}
{{- end }}
+11 -1
View File
@@ -1,4 +1,4 @@
{{- if or (.Values.infraToken) (.Values.logsToken) (.Values.containerToken) }}
{{- if or (.Values.infraToken) (.Values.logseneToken) (.Values.containerToken) }}
{{- if .Capabilities.APIVersions.Has "apps/v1" }}
apiVersion: apps/v1
{{- else }}
@@ -53,6 +53,10 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: STA_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
envFrom:
- configMapRef:
name: {{ template "sematext-agent.fullname" . }}-agent
@@ -80,6 +84,9 @@ spec:
mountPath: /var/run/docker.sock
- name: journal
mountPath: /opt/spm/st-agent
- name: lib
mountPath: /host/usr/lib
readOnly: true
- name: autodisco-template
mountPath: /etc/agent
securityContext:
@@ -126,6 +133,9 @@ spec:
- name: journal
hostPath:
path: /opt/spm/st-agent
- name: lib
hostPath:
path: /host/usr/lib
- name: autodisco-template
configMap:
name: {{ template "sematext-agent.fullname" . }}-agent-autodisco
+1 -1
View File
@@ -10,4 +10,4 @@ type: Opaque
data:
infra-token: {{ default "" .Values.infraToken | b64enc | quote }}
container-token: {{ default "" .Values.containerToken | b64enc | quote }}
logs-token: {{ default "" .Values.logsToken | b64enc | quote }}
logs-token: {{ default "" .Values.logseneToken | b64enc | quote }}
+4 -4
View File
@@ -43,7 +43,7 @@ infraToken: null
# determines the token for the container app (container metrics are delivered here)
containerToken: null
# logsene token to send logs
logsToken: null
logseneToken: null
# for private images
# imagePullSecrets:
@@ -52,9 +52,9 @@ region: US
# support for custom URLs
customUrl: {}
# metricsServer: https://metrics-receiver.apps.test.sematext.com
# eventServer: https://event-receiver.apps.test.sematext.com
# logsServer: https://logs-token-receiver.apps.test.sematext.com
# serverBaseUrl: https://metrics-receiver.apps.test.sematext.com
# eventsRecieverUrl: https://event-receiver.apps.test.sematext.com
# logsReceiverUrl: https://logs-token-receiver.apps.test.sematext.com
tolerations: []