Skip to content

Commit 5cda23d

Browse files
committed
overwrite rawCounters
Signed-off-by: hwassman <[email protected]>
1 parent 3e630d5 commit 5cda23d

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ ENV LOGPATH=$DEFAULTLOGPATH
8383
ARG DEFAULTLOGLEVEL=15
8484
ENV LOGLEVEL=$DEFAULTLOGLEVEL
8585

86+
ARG RAWDATA=None
87+
ENV RAWCOUNTERS=$RAWDATA
88+
8689
RUN echo "the HTTP/S protocol is set to $PROTOCOL" && \
8790
echo "the HTTP/S basic authentication is set to $BASICAUTH" && \
8891
echo "the OpentTSDB API HTTP/S port is set to $PORT" && \
@@ -157,7 +160,7 @@ RUN chown -R $UID:$GID /opt/IBM/bridge && \
157160
# Switch user
158161
USER $GID
159162

160-
CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c $LOGLEVEL -s $SERVER -r $PROTOCOL -b $BASICAUTH -u $BASICAUTHUSER -a $BASICAUTHPASSW -p $PORT -e $PROMETHEUS -P $SERVERPORT -t $TLSKEYPATH -l $LOGPATH -k $TLSKEYFILE -m $TLSCERTFILE -n $APIKEYNAME -v $APIKEYVALUE"]
163+
CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c $LOGLEVEL -s $SERVER -r $PROTOCOL -b $BASICAUTH -u $BASICAUTHUSER -a $BASICAUTHPASSW -p $PORT -e $PROMETHEUS -P $SERVERPORT -t $TLSKEYPATH -l $LOGPATH -k $TLSKEYFILE -m $TLSCERTFILE -n $APIKEYNAME -v $APIKEYVALUE -w $RAWCOUNTERS"]
161164

162165
EXPOSE 4242 8443 9250
163166

source/confParser.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ def parse_cmd_args(argv):
252252
help='Enter your apiKey value:')
253253
parser.add_argument('-d', '--includeDiskData', action="store", choices=["yes", "no"], default=None,
254254
help='Use or not the historical data from disk (Default from config.ini: "no")')
255+
parser.add_argument('-w', '--rawCounters', action="store", choices=["True", "False"], default=None,
256+
help='Controls if original sensor counters should be exposed by PrometheusExporter (Default from config.ini: "True")')
255257

256258
args = parser.parse_args(argv)
257259
return args, ''

0 commit comments

Comments
 (0)