diff --git a/Dockerfile b/Dockerfile index eb621c3..b0a8c39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,7 @@ RUN pip install glances bottle statsd pysnmp COPY glances.conf /etc/glances/glances.conf +RUN useradd -m glances +USER glances + CMD glances -w \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 8e009f3..8710d83 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,14 +2,23 @@ version: '3' services: web: - image: hub.ducoterra.net/ducoterra/temp:0.0.7 + image: hub.ducoterra.net/ducoterra/temp:0.0.8 + build: . ports: - 61208:61208 command: glances -w + volumes: + - web_tmp:/tmp exporter: - image: hub.ducoterra.net/ducoterra/temp:0.0.7 - command: glances --export statsd + image: hub.ducoterra.net/ducoterra/temp:0.0.8 + command: glances -q --export statsd + volumes: + - exporter_tmp:/tmp graphite-statsd: image: hub.ducoterra.net/ducoterra/graphite:0.0.1 ports: - - 8080:80 \ No newline at end of file + - 8080:80 + +volumes: + web_tmp: + exporter_tmp: \ No newline at end of file diff --git a/helm/templates/deploy.yaml b/helm/templates/deploy.yaml index 85fdd31..bb1a649 100644 --- a/helm/templates/deploy.yaml +++ b/helm/templates/deploy.yaml @@ -20,8 +20,8 @@ spec: memory: 1Mi cpu: 1m limits: - memory: 256Mi - cpu: "24" + memory: 512Mi + cpu: "48" - name: {{ .Release.Name }}-exporter image: {{ .Values.image }} command: ["glances", "-q", "--export", "statsd"] @@ -30,5 +30,5 @@ spec: memory: 1Mi cpu: 1m limits: - memory: 256Mi + memory: 512Mi cpu: 250m \ No newline at end of file diff --git a/helm/values.yaml b/helm/values.yaml index 36350f4..9b2cfed 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -1 +1 @@ -image: hub.ducoterra.net/ducoterra/temp:0.0.7 \ No newline at end of file +image: hub.ducoterra.net/ducoterra/temp:0.0.8 \ No newline at end of file