AMBARI-10660 - Need to relocate stacks/HDPWIN/2.1/services/STORM/package/alerts/check_supervisor_process.py (Eugene Chekanskiy via abaranchuk)

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/nimbus.py

@@ -32,7 +32,7 @@ from resource_management.libraries.functions.security_commons import build_expec
 from setup_ranger_storm import setup_ranger_storm
 from ambari_commons import OSConst
 from ambari_commons.os_family_impl import OsFamilyImpl
-
+from resource_management.core.resources.service import Service
 
 class Nimbus(Script):
   def install(self, env):
@@ -132,6 +132,7 @@ class NimbusWindows(Nimbus):
 
   def status(self, env):
     import status_params
+    from resource_management.libraries.functions.windows_service_utils import check_windows_service_status
     env.set_params(status_params)
     check_windows_service_status(status_params.nimbus_win_service_name)
 

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/supervisor.py

@@ -28,6 +28,7 @@ from storm import storm
 from service import service
 from ambari_commons import OSConst
 from ambari_commons.os_family_impl import OsFamilyImpl
+from resource_management.core.resources.service import Service
 
 
 class Supervisor(Script):
@@ -56,6 +57,7 @@ class SupervisorWindows(Supervisor):
 
   def status(self, env):
     import status_params
+    from resource_management.libraries.functions.windows_service_utils import check_windows_service_status
     env.set_params(status_params)
     check_windows_service_status(status_params.supervisor_win_service_name)
 

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/ui_server.py

@@ -33,6 +33,7 @@ from resource_management.libraries.functions.security_commons import build_expec
 from setup_ranger_storm import setup_ranger_storm
 from ambari_commons import OSConst
 from ambari_commons.os_family_impl import OsFamilyImpl
+from resource_management.core.resources.service import Service
 
 
 class UiServer(Script):
@@ -61,6 +62,7 @@ class UiServerWindows(UiServer):
   def status(self, env):
     import status_params
     env.set_params(status_params)
+    from resource_management.libraries.functions.windows_service_utils import check_windows_service_status
     check_windows_service_status(status_params.ui_win_service_name)
 
 

ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/yaml_utils.py

@@ -19,8 +19,10 @@ limitations under the License.
 """
 
 import re
+import os
 import resource_management
 from resource_management.core.source import InlineTemplate
+from resource_management.core.resources.system import File
 
 def escape_yaml_propetry(value):
   unquouted = False
@@ -69,7 +71,7 @@ def yaml_config_template(configurations):
 
 def yaml_config(filename, configurations = None, conf_dir = None, owner = None, group = None):
   import params
-  config_content = source.InlineTemplate('''{% for key, value in configurations_dict.items() %}{{ key }}: {{ escape_yaml_propetry(value) }}
+  config_content = InlineTemplate('''{% for key, value in configurations_dict.items() %}{{ key }}: {{ escape_yaml_propetry(value) }}
 {% endfor %}''', configurations_dict=configurations, extra_imports=[escape_yaml_propetry])
 
   File (os.path.join(params.conf_dir, filename),

ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/alerts.json

@@ -166,7 +166,7 @@
         "scope": "HOST",
         "source": {
           "type": "SCRIPT",
-          "path": "HDPWIN/2.1/services/STORM/package/alerts/check_supervisor_process.py"
+          "path": "STORM/0.9.1.2.1/package/alerts/check_supervisor_process_win.py"
         }
       }
     ]