ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject ambari git commit: AMBARI-17312. Open Advanced logsearch-admin-json upon install (Miklos Gergely via oleewere)
Date Tue, 21 Jun 2016 17:54:26 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 66b9e2561 -> 8f76a5fb1


AMBARI-17312. Open Advanced logsearch-admin-json upon install (Miklos Gergely via oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f76a5fb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f76a5fb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f76a5fb

Branch: refs/heads/branch-2.4
Commit: 8f76a5fb12624556d5fdf05b695db1276bc08a15
Parents: 66b9e25
Author: Miklos Gergely <mgergely@hortonworks.com>
Authored: Tue Jun 21 19:47:33 2016 +0200
Committer: oleewere <oleewere@gmail.com>
Committed: Tue Jun 21 19:53:12 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/data/HDP2/site_properties.js | 6 +++---
 ambari-web/app/models/stack_service.js      | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f76a5fb/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 0262211..e1adbb9 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1939,21 +1939,21 @@ var hdp2properties = [
     "name": "logsearch_admin_username",
     "serviceName": "LOGSEARCH",
     "filename": "logsearch-admin-json.xml",
-    "category": "Advanced logsearch-admin-json",
+    "category": "LogsearchAdminJson",
     "index": 1
   },
   {
     "name": "logsearch_admin_password",
     "serviceName": "LOGSEARCH",
     "filename": "logsearch-admin-json.xml",
-    "category": "Advanced logsearch-admin-json",
+    "category": "LogsearchAdminJson",
     "index": 2
   },
   {
     "name": "content",
     "serviceName": "LOGSEARCH",
     "filename": "logsearch-admin-json.xml",
-    "category": "Advanced logsearch-admin-json",
+    "category": "LogsearchAdminJson",
     "index": 3
   },
   /*logsearch-audit_logs-solrconfig*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f76a5fb/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index c1a5bf5..529da48 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -161,7 +161,7 @@ App.StackService = DS.Model.extend({
     var configTypes = this.get('configTypes');
     var serviceComponents = this.get('serviceComponents');
     if (configTypes && Object.keys(configTypes).length) {
-      var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance",
"HIVE_SERVER2", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration",
"FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$", "AdvancedHawqCheck"];
+      var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance",
"HIVE_SERVER2", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration",
"FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$", "AdvancedHawqCheck",
"LogsearchAdminJson"];
       configCategories = App.StackService.configCategories.call(this).filter(function (_configCategory)
{
         var serviceComponentName = _configCategory.get('name');
         var isServiceComponent = serviceComponents.someProperty('componentName', serviceComponentName);
@@ -361,6 +361,11 @@ App.StackService.configCategories = function () {
         App.ServiceConfigCategory.create({ name: 'AdvancedHawqCheck', displayName: 'Advanced
HAWQ Check'})
       ]);
       break;
+    case 'LOGSEARCH':
+      serviceConfigCategories.pushObjects([
+        App.ServiceConfigCategory.create({ name: 'LogsearchAdminJson', displayName: 'Advanced
logsearch-admin-json'})
+      ]);
+      break;
     default:
       serviceConfigCategories.pushObjects([
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})


Mime
View raw message