Merge pull request #314 from Helene/rawcount

Enable overwriting rawCounters by using cli or env variables

Author: Helene

Dockerfile

@@ -83,6 +83,9 @@ ENV LOGPATH=$DEFAULTLOGPATH
 ARG DEFAULTLOGLEVEL=15
 ENV LOGLEVEL=$DEFAULTLOGLEVEL
 
+ARG RAWDATA=None
+ENV RAWCOUNTERS=$RAWDATA
+
 RUN echo "the HTTP/S protocol is set to $PROTOCOL"  && \
     echo "the HTTP/S basic authentication is set to $BASICAUTH"  && \
     echo "the OpentTSDB API HTTP/S port is set to $PORT"  && \
@@ -157,7 +160,7 @@ RUN chown -R $UID:$GID /opt/IBM/bridge && \
 # Switch user
 USER $GID
 
-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"]
+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"]
 
 EXPOSE 4242 8443 9250
 

source/confParser.py

@@ -252,6 +252,8 @@ def parse_cmd_args(argv):
                         help='Enter your apiKey value:')
     parser.add_argument('-d', '--includeDiskData', action="store", choices=["yes", "no"], default=None,
                         help='Use or not the historical data from disk (Default from config.ini: "no")')
+    parser.add_argument('-w', '--rawCounters', action="store", choices=["True", "False"], default=None,
+                        help='Controls if original sensor counters should be exposed by PrometheusExporter (Default from config.ini: "True")')
 
     args = parser.parse_args(argv)
     return args, ''

tests/test_params.py

@@ -7,7 +7,7 @@
 
 
 def my_setup():
-    global a, b, c, d, e, f, g, m, n, o, p, y, r, s
+    global a, b, c, d, e, f, g, m, n, o, p, y, r, s, w, v
     a = ConfigManager().defaults
     y = ConfigManager().defaults.copy()
     y['apiKeyValue'] = '/tmp/mykey'
@@ -18,6 +18,7 @@ def my_setup():
     m, n = parse_cmd_args(['-d', 'yes'])
     o, p = parse_cmd_args(['-v', 'e40960c9-de0a-4c75-bc71-0bcae6db23b2'])
     r, s = parse_cmd_args(['-p', '4242', '-e', '9250'])
+    w, v = parse_cmd_args(['-w', 'False'])
 
 
 @with_setup(my_setup)
@@ -199,3 +200,12 @@ def test_case16():
         assert 'password' not in result.keys()
         assert valid
         assert len(msg) == 0
+
+
+@with_setup(my_setup)
+def test_case17():
+    if version >= "8.0":
+        result = merge_defaults_and_args(a, w)
+        assert len(result.keys()) > 0
+        assert 'rawCounters' in result.keys()
+        assert result.get('rawCounters') == eval("False")