Add Grafana URL and API Key to GrafYaml CLI

This will allow the use of GrafYaml called from Ansible without
deploying a GrafYaml config file.  With Ansible we can use the template
module to deploy a jinja2 templated GrafYaml dashboard for more
flexibility.

Change-Id: I61a7142c3177681681dcbfe5c889f4c3d59f8ec4

grafana_dashboards/cmd.py

@@ -33,8 +33,8 @@ class Client(object):
 
     def main(self):
         self.parse_arguments()
-        self.read_config()
         self.setup_logging()
+        self.read_config()
 
         self.args.func()
 
@@ -47,6 +47,12 @@ class Client(object):
             '--debug', dest='debug', action='store_true',
             help='Print debugging output (set logging level to DEBUG instead '
             ' of default INFO level)')
+        parser.add_argument(
+            '--grafana-url', dest='grafana_url', help='URL for grafana '
+            'server. The default used is: http://localhost:8080')
+        parser.add_argument(
+            '--grafana-apikey', dest='grafana_apikey',
+            help='API key to access grafana.')
         parser.add_argument(
             '--version', dest='version', action='version',
             version=__version__, help="show "
@@ -82,6 +88,12 @@ class Client(object):
         else:
             fp = '/etc/grafyaml/grafyaml.conf'
         self.config.read(os.path.expanduser(fp))
+        if self.args.grafana_url:
+            self.config.set('grafana', 'url', self.args.grafana_url)
+            LOG.debug('Grafana URL override: {}'.format(self.args.grafana_url))
+        if self.args.grafana_apikey:
+            self.config.set('grafana', 'apikey', self.args.grafana_apikey)
+            LOG.debug('Grafana APIKey overridden')
 
     def setup_logging(self):
         if self.args.debug:

tests/cmd/test_override.py

@@ -0,0 +1,60 @@
+# Copyright 2018 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import os
+import re
+
+from testtools.matchers import MatchesRegex
+
+from tests.cmd.base import TestCase
+
+
+class TestCaseArgs(TestCase):
+    path = os.path.join(
+        os.path.dirname(__file__), '../fixtures/cmd/validate/test0001')
+
+    def test_config_cli_override(self):
+        required = [
+            'Grafana URL override: http://example.grafana.org:3000',
+            '.*?^Grafana APIKey overridden',
+            '.*?^Validating schema in %s' % self.path,
+        ]
+
+        args = [
+            '--grafana-url',
+            'http://example.grafana.org:3000',
+            '--grafana-apikey',
+            'xyz',
+            'validate',
+            self.path,
+        ]
+        stdout, stderr = self.shell(' '.join(args))
+
+        for r in required:
+            self.assertThat(
+                self.log_fixture.output,
+                MatchesRegex(r, re.DOTALL | re.MULTILINE))
+
+    def test_no_override(self):
+        r = 'Validating schema in %s' % self.path
+
+        args = [
+            'validate',
+            self.path,
+        ]
+        stdout, stderr = self.shell(' '.join(args))
+
+        self.assertThat(
+            self.log_fixture.output,
+            MatchesRegex(r))