diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-10-11 11:04:46 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-10-11 11:04:46 +0800 |
| commit | c9c6159b1d495299b28f8b5a727d2e5c84517151 (patch) | |
| tree | 97bfe9b8f073a986cd514d6a88aa1530a3ec92a6 /dashboard/dashboard/elastic2kibana | |
| parent | df4fb1e1f45c381ce038da887c3ca611b19629f7 (diff) | |
always config conf.js in kibana_dashboard
JIRA: FUNCTEST-507
Change-Id: Iad6000ccc94285bd8be03939eb2e83d7f254a887
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'dashboard/dashboard/elastic2kibana')
| -rw-r--r-- | dashboard/dashboard/elastic2kibana/main.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/dashboard/dashboard/elastic2kibana/main.py b/dashboard/dashboard/elastic2kibana/main.py index 35a1543..9ee8942 100644 --- a/dashboard/dashboard/elastic2kibana/main.py +++ b/dashboard/dashboard/elastic2kibana/main.py @@ -64,13 +64,12 @@ class KibanaConstructor(object): visualizations, CONF.es_url, CONF.es_creds) - if CONF.is_js: - self._set_js_dict(case, - pod, - installer, - family, - vis_p.get('name'), - dashboard.id) + self._set_js_dict(case, + pod, + installer, + family, + vis_p.get('name'), + dashboard.id) @staticmethod def _construct_visualizations(project, @@ -112,10 +111,9 @@ class KibanaConstructor(object): js_installer[pod] = CONF.kibana_url + '#/dashboard/' + id def config_js(self): - if CONF.is_js: - with open(CONF.js_path, 'w+') as conf_js_fdesc: - conf_js_fdesc.write('var kibana_dashboard_links = ') - conf_js_fdesc.write(str(self.js_dict).replace("u'", "'")) + with open(CONF.js_path, 'w+') as conf_js_fdesc: + conf_js_fdesc.write('var kibana_dashboard_links = ') + conf_js_fdesc.write(str(self.js_dict).replace("u'", "'")) def _get_pods_and_scenarios(self, project, case, installer): query = json.JSONEncoder().encode({ |