You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by mm...@apache.org on 2019/08/01 19:49:55 UTC
[metron] branch master updated: METRON-2189 Optimize imports in
mpack python scripts (mmiklavc) closes apache/metron#1467
This is an automated email from the ASF dual-hosted git repository.
mmiklavcic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron.git
The following commit(s) were added to refs/heads/master by this push:
new 340827f METRON-2189 Optimize imports in mpack python scripts (mmiklavc) closes apache/metron#1467
340827f is described below
commit 340827f2569767056698ac38cf4517dc866c4e06
Author: mmiklavc <mi...@gmail.com>
AuthorDate: Thu Aug 1 13:49:24 2019 -0600
METRON-2189 Optimize imports in mpack python scripts (mmiklavc) closes apache/metron#1467
---
.../5.6.14/package/scripts/elastic_commands.py | 14 ++++++--------
.../5.6.14/package/scripts/elastic_master.py | 7 ++++---
.../ELASTICSEARCH/5.6.14/package/scripts/elastic_slave.py | 3 ++-
.../ELASTICSEARCH/5.6.14/package/scripts/service_check.py | 4 ++--
.../KIBANA/5.6.14/package/scripts/common.py | 8 +++++---
.../KIBANA/5.6.14/package/scripts/kibana_master.py | 2 +-
.../METRON/CURRENT/package/scripts/alerts_ui_commands.py | 4 ++--
.../METRON/CURRENT/package/scripts/alerts_ui_master.py | 10 +---------
.../CURRENT/package/scripts/dashboard/dashboardindex.py | 10 ++++++----
.../METRON/CURRENT/package/scripts/enrichment_commands.py | 6 +++---
.../METRON/CURRENT/package/scripts/enrichment_master.py | 10 +++++-----
.../METRON/CURRENT/package/scripts/indexing_commands.py | 8 ++++----
.../METRON/CURRENT/package/scripts/indexing_master.py | 15 +++++++--------
.../CURRENT/package/scripts/management_ui_commands.py | 6 ++----
.../CURRENT/package/scripts/management_ui_master.py | 7 ++-----
.../METRON/CURRENT/package/scripts/metron_client.py | 11 +++++------
.../METRON/CURRENT/package/scripts/metron_security.py | 7 ++++---
.../METRON/CURRENT/package/scripts/metron_service.py | 12 ++++++------
.../METRON/CURRENT/package/scripts/params/params.py | 2 +-
.../METRON/CURRENT/package/scripts/params/params_linux.py | 9 +++------
.../CURRENT/package/scripts/params/status_params.py | 4 ++--
.../METRON/CURRENT/package/scripts/parser_commands.py | 9 ++++-----
.../METRON/CURRENT/package/scripts/parser_master.py | 7 +++----
.../METRON/CURRENT/package/scripts/pcap_commands.py | 11 ++++-------
.../METRON/CURRENT/package/scripts/pcap_master.py | 13 ++++---------
.../METRON/CURRENT/package/scripts/profiler_commands.py | 6 +++---
.../METRON/CURRENT/package/scripts/profiler_master.py | 13 ++++---------
.../METRON/CURRENT/package/scripts/rest_commands.py | 6 ++----
.../METRON/CURRENT/package/scripts/rest_master.py | 8 ++++----
.../METRON/CURRENT/package/scripts/service_check.py | 14 +++++++-------
.../common-services/METRON/CURRENT/service_advisor.py | 6 ++----
31 files changed, 110 insertions(+), 142 deletions(-)
diff --git a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_commands.py b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_commands.py
index 618d10a..277c3c9 100644
--- a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_commands.py
+++ b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_commands.py
@@ -18,20 +18,18 @@ limitations under the License.
"""
-import os
-
from ambari_commons.os_check import OSCheck
-from resource_management.core.exceptions import ExecutionFailed
from resource_management.core.exceptions import ComponentIsNotRunning
-from resource_management.core.resources.system import Execute
+from resource_management.core.exceptions import ExecutionFailed
+from resource_management.core.logger import Logger
+from resource_management.core.resources import User
from resource_management.core.resources.system import Directory
+from resource_management.core.resources.system import Execute
from resource_management.core.resources.system import File
from resource_management.core.source import InlineTemplate
from resource_management.core.source import Template
-from resource_management.core.resources import User
-from resource_management.core.logger import Logger
-from resource_management.libraries.functions import format as ambari_format
-from resource_management.libraries.functions.get_user_call_output import get_user_call_output
+from resource_management.libraries.functions.get_user_call_output import \
+ get_user_call_output
def service_check(cmd, user, label):
diff --git a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_master.py b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_master.py
index 142ce4e..c478639 100755
--- a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_master.py
+++ b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_master.py
@@ -17,12 +17,13 @@ limitations under the License.
"""
-from resource_management.core import shell
+from resource_management.core.logger import Logger
from resource_management.core.resources.system import Execute
from resource_management.libraries.script import Script
-from resource_management.core.logger import Logger
-from elastic_commands import service_check
+
from elastic_commands import configure_master
+from elastic_commands import service_check
+
class Elasticsearch(Script):
diff --git a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_slave.py b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_slave.py
index 2d559ff..c880f22 100755
--- a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_slave.py
+++ b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/elastic_slave.py
@@ -21,8 +21,9 @@ from resource_management.core.logger import Logger
from resource_management.core.resources.system import Execute
from resource_management.libraries.script import Script
-from elastic_commands import service_check
from elastic_commands import configure_slave
+from elastic_commands import service_check
+
class Elasticsearch(Script):
diff --git a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/service_check.py b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/service_check.py
index 3ac7c83..0487115 100755
--- a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/service_check.py
+++ b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.14/package/scripts/service_check.py
@@ -21,11 +21,11 @@ from __future__ import print_function
import subprocess
import sys
-import re
+from resource_management.core.logger import Logger
from resource_management.core.resources.system import Execute
from resource_management.libraries.script import Script
-from resource_management.core.logger import Logger
+
class ServiceCheck(Script):
diff --git a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/common.py b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/common.py
index 37100cd..6a32b84 100644
--- a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/common.py
+++ b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/common.py
@@ -17,10 +17,12 @@ limitations under the License.
"""
-from resource_management.core.logger import Logger
-from resource_management.libraries.functions.get_user_call_output import get_user_call_output
-from resource_management.core.exceptions import ExecutionFailed
from resource_management.core.exceptions import ComponentIsNotRunning
+from resource_management.core.exceptions import ExecutionFailed
+from resource_management.core.logger import Logger
+from resource_management.libraries.functions.get_user_call_output import \
+ get_user_call_output
+
def service_check(cmd, user, label):
"""
diff --git a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/kibana_master.py b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/kibana_master.py
index c013ea3..7924a99 100755
--- a/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/kibana_master.py
+++ b/metron-deployment/packaging/ambari/elasticsearch-mpack/src/main/resources/common-services/KIBANA/5.6.14/package/scripts/kibana_master.py
@@ -21,11 +21,11 @@ from resource_management.core.resources.system import Directory
from resource_management.core.resources.system import Execute
from resource_management.core.resources.system import File
from resource_management.core.source import InlineTemplate
-from resource_management.libraries.functions.format import format as ambari_format
from resource_management.libraries.script import Script
from common import service_check
+
class Kibana(Script):
def install(self, env):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py
index f837043..edec983 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py
@@ -18,10 +18,10 @@ limitations under the License.
"""
+import metron_service
from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute, File
+from resource_management.core.resources.system import Execute
-import metron_service
# Wrap major operations and functionality in this class
class AlertsUICommands:
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_master.py
index 7cc2c31..c620385 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_master.py
@@ -17,20 +17,12 @@ limitations under the License.
"""
-from resource_management.core.exceptions import ComponentIsNotRunning
-from resource_management.core.exceptions import ExecutionFailed
+from alerts_ui_commands import AlertsUICommands
from resource_management.core.exceptions import Fail
-from resource_management.core.resources.system import Directory
from resource_management.core.resources.system import File
from resource_management.core.source import Template
from resource_management.libraries.functions.format import format
-from resource_management.libraries.functions.get_user_call_output import get_user_call_output
from resource_management.libraries.script import Script
-from resource_management.core.resources.system import Execute
-
-from resource_management.core.logger import Logger
-
-from alerts_ui_commands import AlertsUICommands
class AlertsUIMaster(Script):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/dashboard/dashboardindex.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/dashboard/dashboardindex.py
index f0903ac..4de089e 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/dashboard/dashboardindex.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/dashboard/dashboardindex.py
@@ -16,12 +16,14 @@
# limitations under the License.
#
-from elasticsearch import Elasticsearch
-from elasticsearch.helpers import bulk
+import argparse
+import os
+import os.path
+
import cPickle as pickle
-import argparse, sys, os.path
import errno
-import os
+from elasticsearch import Elasticsearch
+from elasticsearch.helpers import bulk
class DashboardIndex(object):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py
index 80cc1fa..487f166 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_commands.py
@@ -16,15 +16,15 @@ limitations under the License.
"""
import os
+
import time
+import metron_service
+from metron_security import kinit
from resource_management.core.exceptions import Fail
from resource_management.core.logger import Logger
from resource_management.core.resources.system import Execute
-import metron_service
-from metron_security import kinit
-
# Wrap major operations and functionality in this class
class EnrichmentCommands:
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py
index cd54a6d..15d08e1 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/enrichment_master.py
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
+import metron_security
+import metron_service
+from enrichment_commands import EnrichmentCommands
+from metron_security import storm_security_setup
from resource_management.core.exceptions import ComponentIsNotRunning
+from resource_management.core.logger import Logger
from resource_management.core.resources.system import File
from resource_management.core.source import Template
from resource_management.libraries.functions.format import format
from resource_management.libraries.script import Script
-from resource_management.core.logger import Logger
-from enrichment_commands import EnrichmentCommands
-from metron_security import storm_security_setup
-import metron_service
-import metron_security
class Enrichment(Script):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py
index a75a918..69e8dff 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_commands.py
@@ -17,18 +17,18 @@ limitations under the License.
import os
import re
+
import requests
import time
-from datetime import datetime
+import metron_security
+import metron_service
from resource_management.core.exceptions import Fail
from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute, File
+from resource_management.core.resources.system import Execute
from resource_management.libraries.functions import format as ambari_format
from resource_management.libraries.functions.format import format
-import metron_service
-import metron_security
# Wrap major operations and functionality in this class
class IndexingCommands:
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py
index d058745..87064bc 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py
@@ -14,26 +14,25 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-import errno
import os
+
+import errno
import requests
+import metron_service
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
-
+from indexing_commands import IndexingCommands
+from metron_security import storm_security_setup
from resource_management.core.exceptions import ComponentIsNotRunning
from resource_management.core.logger import Logger
from resource_management.core.resources.system import Execute
from resource_management.core.resources.system import File
-from resource_management.core.source import Template
-from resource_management.libraries.functions.format import format
from resource_management.core.source import StaticFile
+from resource_management.core.source import Template
from resource_management.libraries.functions import format as ambari_format
+from resource_management.libraries.functions.format import format
from resource_management.libraries.script import Script
-from metron_security import storm_security_setup
-import metron_service
-from indexing_commands import IndexingCommands
-
class Indexing(Script):
__configured = False
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py
index 4e81df6..82a2dd2 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py
@@ -18,12 +18,10 @@ limitations under the License.
"""
+import metron_service
from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute, File
-from resource_management.core.exceptions import ExecutionFailed
-from resource_management.libraries.functions.get_user_call_output import get_user_call_output
+from resource_management.core.resources.system import Execute
-import metron_service
# Wrap major operations and functionality in this class
class ManagementUICommands:
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py
index c50b09c..c41bf75 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py
@@ -17,16 +17,13 @@ limitations under the License.
"""
+from management_ui_commands import ManagementUICommands
+from resource_management.core.exceptions import Fail
from resource_management.core.resources.system import Directory
from resource_management.core.resources.system import File
from resource_management.core.source import Template
from resource_management.libraries.functions.format import format
from resource_management.libraries.script import Script
-from resource_management.core.resources.system import Execute
-from resource_management.core.logger import Logger
-from resource_management.core.exceptions import Fail
-
-from management_ui_commands import ManagementUICommands
class ManagementUIMaster(Script):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_client.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_client.py
index 97083c6..6f9f9a9 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_client.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_client.py
@@ -17,15 +17,14 @@ limitations under the License.
"""
-from resource_management.libraries.script.script import Script
-from resource_management.core.exceptions import ClientComponentHasNoStatus
-from resource_management.core.exceptions import Fail
-from resource_management.core.resources.system import Directory
from metron_security import storm_security_setup
from metron_service import install_metron_knox
-from metron_service import metron_knox_topology_setup
from metron_service import is_metron_knox_installed
-from metron_service import set_metron_knox_installed
+from metron_service import metron_knox_topology_setup
+from resource_management.core.exceptions import ClientComponentHasNoStatus
+from resource_management.core.exceptions import Fail
+from resource_management.libraries.script.script import Script
+
class MetronClient(Script):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_security.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_security.py
index d9486e8..635dbc4 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_security.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_security.py
@@ -15,12 +15,13 @@ limitations under the License.
"""
import os.path
-from resource_management.core.source import Template
-from resource_management.core.source import InlineTemplate
-from resource_management.core.resources.system import Directory, File
+
from resource_management.core import global_lock
from resource_management.core.logger import Logger
+from resource_management.core.resources.system import Directory, File
from resource_management.core.resources.system import Execute
+from resource_management.core.source import InlineTemplate
+from resource_management.core.source import Template
from resource_management.libraries.functions import format as ambari_format
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
index d7c505e..9703d1f 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py
@@ -16,22 +16,22 @@ limitations under the License.
import json
import os
-import subprocess
from datetime import datetime
-from resource_management.core.logger import Logger
+
+from metron_security import kinit
from resource_management.core.exceptions import ComponentIsNotRunning
from resource_management.core.exceptions import Fail
+from resource_management.core.logger import Logger
from resource_management.core.resources.system import Directory, File
from resource_management.core.resources.system import Execute
-from resource_management.core.source import Template
from resource_management.core.source import InlineTemplate
+from resource_management.core.source import Template
from resource_management.libraries.functions import format as ambari_format
-from resource_management.libraries.functions.get_user_call_output import get_user_call_output
+from resource_management.libraries.functions.get_user_call_output import \
+ get_user_call_output
from resource_management.libraries.script import Script
-from metron_security import kinit
-
def is_zk_configured(params):
return os.path.isfile(params.zk_configured_flag_file)
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params.py
index 953435d..c39c76e 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params.py
@@ -22,7 +22,7 @@ from resource_management.libraries.functions.default import default
from resource_management.libraries.functions.expect import expect
if OSCheck.is_windows_family():
- from params_windows import *
+ pass
else:
from params_linux import *
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
index 09205bc..c4a6a7b 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
@@ -21,19 +21,16 @@ limitations under the License.
import functools
import os
+import status_params
from resource_management.libraries.functions import conf_select
from resource_management.libraries.functions import format
from resource_management.libraries.functions import get_kinit_path
from resource_management.libraries.functions import stack_select
from resource_management.libraries.functions.default import default
-from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources
+from resource_management.libraries.functions.get_not_managed_resources import \
+ get_not_managed_resources
from resource_management.libraries.resources.hdfs_resource import HdfsResource
from resource_management.libraries.script import Script
-from resource_management.libraries.functions.version import format_stack_version
-from resource_management.libraries.functions.stack_features import check_stack_feature
-from resource_management.libraries.functions import StackFeature
-
-import status_params
# server configurations
config = Script.get_config()
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py
index fc5daac..aec0afe 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py
@@ -18,10 +18,10 @@ limitations under the License.
"""
-from resource_management.libraries.script import Script
-from resource_management.libraries.functions import get_kinit_path
from resource_management.libraries.functions import default, format
+from resource_management.libraries.functions import get_kinit_path
from resource_management.libraries.functions.version import format_stack_version
+from resource_management.libraries.script import Script
config = Script.get_config()
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py
index a687085..2bcbefa 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_commands.py
@@ -22,15 +22,14 @@ import os
import re
import shlex
import subprocess
+
import time
-from datetime import datetime
+import metron_security
+import metron_service
from resource_management.core.exceptions import Fail
from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute, File
-
-import metron_service
-import metron_security
+from resource_management.core.resources.system import Execute
# Wrap major operations and functionality in this class
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py
index d5b333a..f76828f 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/parser_master.py
@@ -17,14 +17,13 @@ limitations under the License.
"""
+import metron_service
+from metron_security import storm_security_setup
+from parser_commands import ParserCommands
from resource_management.core.exceptions import ComponentIsNotRunning
from resource_management.core.logger import Logger
from resource_management.libraries.script import Script
-from metron_security import storm_security_setup
-import metron_service
-from parser_commands import ParserCommands
-
class ParserMaster(Script):
def get_component_name(self):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/pcap_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/pcap_commands.py
index 2190916..00f3b3c 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/pcap_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/pcap_commands.py
@@ -19,17 +19,14 @@ limitations under the License.
"""
import os
-import re
-import subprocess
+
import time
-from datetime import datetime
+import metron_security
+import metron_service
from resource_management.core.exceptions import Fail
from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute, File
-
-import metron_service
-import metron_security
+from resource_management.core.resources.system import Execute
# Wrap major operations and functionality in this class
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/pcap_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/pcap_master.py
index 109c035..ead5b57 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/pcap_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/pcap_master.py
@@ -14,22 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-import os
+import metron_security
+import metron_service
+from metron_security import storm_security_setup
+from pcap_commands import PcapCommands
from resource_management.core.exceptions import ComponentIsNotRunning
from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute
from resource_management.core.resources.system import File
from resource_management.core.source import Template
from resource_management.libraries.functions.format import format
-from resource_management.core.source import StaticFile
-from resource_management.libraries.functions import format as ambari_format
from resource_management.libraries.script import Script
-from metron_security import storm_security_setup
-import metron_service
-import metron_security
-from pcap_commands import PcapCommands
-
class Pcap(Script):
__configured = False
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/profiler_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/profiler_commands.py
index b026a30..8f13e62 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/profiler_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/profiler_commands.py
@@ -16,15 +16,15 @@ limitations under the License.
"""
import os
+
import time
+import metron_security
+import metron_service
from resource_management.core.exceptions import Fail
from resource_management.core.logger import Logger
from resource_management.core.resources.system import Execute
-import metron_security
-import metron_service
-
# Wrap major operations and functionality in this class
class ProfilerCommands:
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/profiler_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/profiler_master.py
index ddfadd2..6dced58 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/profiler_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/profiler_master.py
@@ -14,22 +14,17 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
-import os
+import metron_security
+import metron_service
+from metron_security import storm_security_setup
+from profiler_commands import ProfilerCommands
from resource_management.core.exceptions import ComponentIsNotRunning
from resource_management.core.logger import Logger
-from resource_management.core.resources.system import Execute
from resource_management.core.resources.system import File
from resource_management.core.source import Template
from resource_management.libraries.functions.format import format
-from resource_management.core.source import StaticFile
-from resource_management.libraries.functions import format as ambari_format
from resource_management.libraries.script import Script
-from metron_security import storm_security_setup
-import metron_service
-import metron_security
-from profiler_commands import ProfilerCommands
-
class Profiler(Script):
__configured = False
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py
index bab9129..df8a7fc 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py
@@ -19,16 +19,14 @@ limitations under the License.
"""
import os
-from datetime import datetime
+import metron_service
+from metron_security import kinit
from resource_management.core.logger import Logger
from resource_management.core.resources.system import Directory, Execute, File
from resource_management.libraries.functions import get_user_call_output
from resource_management.libraries.functions.format import format
from resource_management.libraries.functions.show_logs import show_logs
-import metron_service
-from metron_security import kinit
-
# Wrap major operations and functionality in this class
class RestCommands:
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py
index 90f4ac5..4370bd1 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py
@@ -17,19 +17,19 @@ limitations under the License.
"""
+import metron_service
from resource_management.core.exceptions import ComponentIsNotRunning
from resource_management.core.exceptions import ExecutionFailed
from resource_management.core.exceptions import Fail
-from resource_management.core.resources.system import Directory
from resource_management.core.resources.system import File
from resource_management.core.source import Template
from resource_management.libraries.functions.format import format
-from resource_management.libraries.functions.get_user_call_output import get_user_call_output
+from resource_management.libraries.functions.get_user_call_output import \
+ get_user_call_output
from resource_management.libraries.script import Script
-
-import metron_service
from rest_commands import RestCommands
+
class RestMaster(Script):
def install(self, env):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/service_check.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/service_check.py
index 2007f36..f1a017d 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/service_check.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/service_check.py
@@ -19,16 +19,16 @@ limitations under the License.
"""
from __future__ import print_function
-from resource_management.core.logger import Logger
-from resource_management.libraries.script import Script
-
-from parser_commands import ParserCommands
+from alerts_ui_commands import AlertsUICommands
from enrichment_commands import EnrichmentCommands
from indexing_commands import IndexingCommands
-from profiler_commands import ProfilerCommands
-from rest_commands import RestCommands
from management_ui_commands import ManagementUICommands
-from alerts_ui_commands import AlertsUICommands
+from parser_commands import ParserCommands
+from profiler_commands import ProfilerCommands
+from resource_management.core.logger import Logger
+from resource_management.libraries.script import Script
+from rest_master import RestCommands
+
class ServiceCheck(Script):
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py
index 36cec7c..6584a37 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/service_advisor.py
@@ -17,12 +17,10 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import os
-import fnmatch
-import imp
-import socket
-import sys
import traceback
+import imp
+
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
STACKS_DIR = os.path.join(SCRIPT_DIR, '../../../../../stacks/')
PARENT_FILE = os.path.join(STACKS_DIR, 'service_advisor.py')