X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FMON%2FDockerfile;h=a91b957d6fb237d5f495c199629939b27f071328;hb=a4a37f7f9f5410ff2c7833b76bdc85f752c74849;hp=b6eff1b55cf39dc182cb6730720e38d6e8e51ba6;hpb=6e80483a5fa0074696efdd2c231df7dc2a2db5c7;p=osm%2Fdevops.git diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile index b6eff1b5..a91b957d 100644 --- a/docker/MON/Dockerfile +++ b/docker/MON/Dockerfile @@ -42,10 +42,10 @@ RUN apt-get update \ RUN pip3 install 'macaroonbakery>=1.1,<2.0' 'pyRFC3339>=1.0,<2.0' \ 'pyyaml>=5.1.2' 'theblues>=0.3.8,<1.0' 'websockets>=4.0,<5.0' \ - 'paramiko' # PyNaCl + 'paramiko' 'dogpile.cache==0.9.2' ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily +ARG RELEASE=ReleaseEIGHT-daily ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg ARG REPOSITORY=testing @@ -61,7 +61,7 @@ RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - \ python3-n2vc${N2VC_VERSION} -RUN python3 -m pip install -U juju +RUN python3 -m pip install -U "juju==2.8.2" COPY scripts/ scripts/ @@ -84,6 +84,9 @@ ENV OSMMON_DATABASE_COMMONKEY changeme ENV OSMMON_COLLECTOR_INTERVAL 30 ENV OSMMON_EVALUATOR_INTERVAL 30 ENV OSMMON_PROMETHEUS_URL http://prometheus:9090 +ENV OSMMON_GRAFANA_URL http://grafana:3000 +ENV OSMMON_GRAFANA_USER admin +ENV OSMMON_GRAFANA_PASSWORD admin EXPOSE 8000