Merge branch 'feature/start-options' into 'master'

Feature/start options - add storage.tsdb.retention.time

See merge request cloudron/prometheus-server-app!3
This commit is contained in:
Johannes Zellner 2021-10-12 11:34:08 +00:00
commit fe72ecea92
4 changed files with 21 additions and 8 deletions

View file

@ -8,6 +8,6 @@ ARG VERSION=2.30.3
# install Prometheus # install Prometheus
RUN curl -L https://github.com/prometheus/prometheus/releases/download/v${VERSION}/prometheus-${VERSION}.linux-amd64.tar.gz | tar zxvf - --strip-components 1 RUN curl -L https://github.com/prometheus/prometheus/releases/download/v${VERSION}/prometheus-${VERSION}.linux-amd64.tar.gz | tar zxvf - --strip-components 1
COPY start.sh /app/pkg/ COPY docker /
CMD [ "/app/pkg/start.sh" ] CMD [ "/app/pkg/start.sh" ]

View file

@ -0,0 +1,4 @@
#!/bin/bash
# https://prometheus.io/docs/prometheus/latest/storage/#operational-aspects
export retention_time="15d"

View file

@ -11,5 +11,14 @@ fi
chown -R cloudron:cloudron /app/data chown -R cloudron:cloudron /app/data
if [ ! -f /app/data/prometheus_variables.sh ]; then
echo "=> Copy default prometheus variable file since it does not exist"
cp /app/code/default_prometheus_variables.sh /app/data/prometheus_variables.sh
fi
echo "=> Source custom variables"
source /app/data/prometheus_variables.sh
echo "=> Starting Prometheus" echo "=> Starting Prometheus"
exec /usr/local/bin/gosu cloudron:cloudron /app/code/prometheus --config.file=/app/data/config/prometheus.yml --storage.tsdb.path=/app/data/runtime echo "=> Starting with retention time of $retention_time"
exec /usr/local/bin/gosu cloudron:cloudron /app/code/prometheus --config.file=/app/data/config/prometheus.yml --storage.tsdb.path=/app/data/runtime --storage.tsdb.retention.time="${retention_time:-15d}"

12
test/package-lock.json generated
View file

@ -33,9 +33,9 @@
"integrity": "sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw==" "integrity": "sha512-8UT/J+xqCYfn3fKtOznAibsHpiuDshCb0fwgWxRazTT19Igp9ovoXMPhXyLD6m3CKQGTMHgqoxaFfMWaL40Rnw=="
}, },
"@types/node": { "@types/node": {
"version": "16.10.1", "version": "16.10.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.1.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz",
"integrity": "sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w==", "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==",
"optional": true "optional": true
}, },
"@types/yauzl": { "@types/yauzl": {
@ -617,9 +617,9 @@
"dev": true "dev": true
}, },
"is-glob": { "is-glob": {
"version": "4.0.2", "version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.2.tgz", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
"integrity": "sha512-ZZTOjRcDjuAAAv2cTBQP/lL59ZTArx77+7UzHdWW/XB1mrfp7DEaVpKmZ0XIzx+M7AxfhKcqV+nMetUQmFifwg==", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
"requires": { "requires": {
"is-extglob": "^2.1.1" "is-extglob": "^2.1.1"
} }