diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-10-17 17:00:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-17 17:00:32 +0000 |
| commit | cf29e20418012f850d0fa18de5bd24a49f819886 (patch) | |
| tree | 2e8d152156d055e5f5d1fe2030de1f7b1a76532b /dashboard/dashboard/elastic2kibana | |
| parent | 00557743a6618c2b5321c7ed0d1eede9a2c6e64a (diff) | |
| parent | f2e764a50b598eced8806fc0da1b3a21b7d91ec3 (diff) | |
Merge "project-ize kibana_dashboard"
Diffstat (limited to 'dashboard/dashboard/elastic2kibana')
4 files changed, 7 insertions, 7 deletions
diff --git a/dashboard/dashboard/elastic2kibana/dashboard_assembler.py b/dashboard/dashboard/elastic2kibana/dashboard_assembler.py index da7ccfc..651168b 100644 --- a/dashboard/dashboard/elastic2kibana/dashboard_assembler.py +++ b/dashboard/dashboard/elastic2kibana/dashboard_assembler.py @@ -1,7 +1,7 @@ import json import utility -from common import elastic_access +from dashboard.common import elastic_access class DashboardAssembler(object): diff --git a/dashboard/dashboard/elastic2kibana/main.py b/dashboard/dashboard/elastic2kibana/main.py index 4542c31..5af512e 100644 --- a/dashboard/dashboard/elastic2kibana/main.py +++ b/dashboard/dashboard/elastic2kibana/main.py @@ -4,10 +4,10 @@ import urlparse import argparse -from common import elastic_access -from common import logger_utils -from conf import config -from conf import testcases +from dashboard.common import elastic_access +from dashboard.common import logger_utils +from dashboard.conf import config +from dashboard.conf import testcases from dashboard_assembler import DashboardAssembler from visualization_assembler import VisualizationAssembler diff --git a/dashboard/dashboard/elastic2kibana/utility.py b/dashboard/dashboard/elastic2kibana/utility.py index dccd28a..55578bd 100644 --- a/dashboard/dashboard/elastic2kibana/utility.py +++ b/dashboard/dashboard/elastic2kibana/utility.py @@ -2,7 +2,7 @@ import json from jinja2 import Environment, PackageLoader -env = Environment(loader=PackageLoader('elastic2kibana', 'templates')) +env = Environment(loader=PackageLoader('dashboard', 'elastic2kibana/templates')) env.filters['jsonify'] = json.dumps diff --git a/dashboard/dashboard/elastic2kibana/visualization_assembler.py b/dashboard/dashboard/elastic2kibana/visualization_assembler.py index 1cb0ba8..d7e6e54 100644 --- a/dashboard/dashboard/elastic2kibana/visualization_assembler.py +++ b/dashboard/dashboard/elastic2kibana/visualization_assembler.py @@ -1,7 +1,7 @@ import json import utility -from common import elastic_access +from dashboard.common import elastic_access class VisStateBuilder(object): |