Enable configurable uris in graph.py

Make the crrently hardcoded database, elastic search,
and logstash uris configurable using a conf file.

Use the configured logstash url in the the web gate.html
and index.html.

Change-Id: I282745796a40f10955e0c9893e817779b2d4d55a
This commit is contained in:
Ramy Asselin 2015-10-19 22:27:43 +00:00
parent 96dca00b19
commit 27146fe0c4
3 changed files with 26 additions and 4 deletions

View File

@ -15,6 +15,7 @@
# under the License.
import argparse
import ConfigParser
from datetime import datetime
import json
import os
@ -83,12 +84,31 @@ def main():
help='output filename')
parser.add_argument('-q', dest='queue',
help='limit results to a specific build queue')
parser.add_argument('-c', '--conf', help="Elastic Recheck Configuration "
"file to use for data_source options such as "
"elastic search url, logstash url, and database "
"uri.")
parser.add_argument('-v', dest='verbose',
action='store_true', default=False,
help='print out details as we go')
args = parser.parse_args()
classifier = er.Classifier(args.queries)
# Start with defaults
es_url = er.ES_URL
ls_url = er.LS_URL
db_uri = er.DB_URI
if args.conf:
config = ConfigParser.ConfigParser({'es_url': er.ES_URL,
'ls_url': er.LS_URL,
'db_uri': er.DB_URI})
config.read(args.conf)
if config.has_section('data_source'):
es_url = config.get('data_source', 'es_url')
ls_url = config.get('data_source', 'ls_url')
db_uri = config.get('data_source', 'db_uri')
classifier = er.Classifier(args.queries, es_url=es_url, db_uri=db_uri)
buglist = []
@ -131,10 +151,12 @@ def main():
LOG.debug("Starting query for bug %s" % query['bug'])
logstash_query = qb.encode_logstash_query(query['query'],
timeframe=timeframe)
logstash_url = ("%s/#/dashboard/file/logstash.json?%s"
% (ls_url, logstash_query))
bug_data = get_launchpad_bug(query['bug'])
bug = dict(number=query['bug'],
query=query['query'],
logstash_query=logstash_query,
logstash_url=logstash_url,
bug_data=bug_data,
fails=0,
fails24=0,

View File

@ -70,7 +70,7 @@
</div>
{{/if}}
<div class="graph"></div>
<a class="extlink" href="http://logstash.openstack.org/#/dashboard/file/logstash.json?{{bug.logstash_query}}">Logstash</a>
<a class="extlink" href="{{bug.logstash_url}}">Logstash</a>
<a class="extlink" href="http://bugs.launchpad.net/bugs/{{bug.number}}">Launchpad</a>
</div>
</script>

View File

@ -73,7 +73,7 @@
</div>
{{/if}}
<div class="graph"></div>
<a class="extlink" href="http://logstash.openstack.org/#/dashboard/file/logstash.json?{{bug.logstash_query}}">Logstash</a>
<a class="extlink" href="{{bug.logstash_url}}">Logstash</a>
<a class="extlink" href="http://bugs.launchpad.net/bugs/{{bug.number}}">Launchpad</a>
</div>
</script>