Ver código fonte

AMBARI-17451. Put logsearch log level filter into smartconfigs (oleewere)

oleewere 9 anos atrás
pai
commit
2f39d08255

+ 1 - 1
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml

@@ -115,7 +115,7 @@
   <property>
     <name>logsearch.logfeeder.include.default.level</name>
     <value>FATAL,ERROR,WARN</value>
-    <description>Include default Logfeeder log levels for Log Search. Used for bootstrapping the configuration only.</description>
+    <description>Include default Logfeeder log levels for Log Search. Used for bootstrapping the configuration only. (levels: FATAL,ERROR,WARN,INFO,DEBUG,TRACE)</description>
     <display-name>Logfeeder log levels</display-name>
     <value-attributes>
       <editable-only-at-install>true</editable-only-at-install>

+ 10 - 0
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/themes/theme.json

@@ -76,6 +76,10 @@
           "config": "logsearch-solr-env/logsearch_solr_znode",
           "subsection-name": "subsection-logsearch-solr-col1"
         },
+        {
+          "config" : "logsearch-properties/logsearch.logfeeder.include.default.level",
+          "subsection-name": "subsection-logsearch-server-col1"
+        },
         {
           "config": "logsearch-env/logsearch_app_max_memory",
           "subsection-name": "subsection-logsearch-server-col1"
@@ -144,6 +148,12 @@
           ]
         }
       },
+      {
+        "config": "logsearch-properties/logsearch.logfeeder.include.default.level",
+        "widget": {
+          "type": "text-field"
+        }
+      },
       {
         "config": "logsearch-properties/logsearch.collection.service.logs.numshards",
         "widget": {

+ 4 - 11
ambari-web/app/data/HDP2/site_properties.js

@@ -2178,40 +2178,33 @@ var hdp2properties = [
     "category": "Advanced logsearch-properties",
     "index": 5
   },
-  {
-    "name": "logsearch.logfeeder.include.default.level",
-    "serviceName": "LOGSEARCH",
-    "filename": "logsearch-properties.xml",
-    "category": "Advanced logsearch-properties",
-    "index": 6
-  },
   {
     "name": "logsearch.solr.metrics.collector.hosts",
     "serviceName": "LOGSEARCH",
     "filename": "logsearch-properties.xml",
     "category": "Advanced logsearch-properties",
-    "index": 9
+    "index": 6
   },
   {
     "name": "logsearch.external.auth.enabled",
     "serviceName": "LOGSEARCH",
     "filename": "logsearch-properties.xml",
     "category": "Advanced logsearch-properties",
-    "index": 10
+    "index": 7
   },
   {
     "name": "logsearch.external.auth.host_url",
     "serviceName": "LOGSEARCH",
     "filename": "logsearch-properties.xml",
     "category": "Advanced logsearch-properties",
-    "index": 11
+    "index": 8
   },
   {
     "name": "logsearch.external.auth.login_url",
     "serviceName": "LOGSEARCH",
     "filename": "logsearch-properties.xml",
     "category": "Advanced logsearch-properties",
-    "index": 12
+    "index": 9
   },
   /*logsearch-solr-env*/
   {