AMBARI-23991. Log Search: cleanup Ambari audits collection / schema. (#1422)

2 files changed, 217 insertions, 1 deletions

diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/configsets/audit_logs/conf/managed-schema b/ambari-logsearch/ambari-logsearch-server/src/main/configsets/audit_logs/conf/managed-schema
index fc99a0328d..11d94b49d3 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/configsets/audit_logs/conf/managed-schema
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/configsets/audit_logs/conf/managed-schema
@@ -121,7 +121,7 @@
   <dynamicField name="ngram_*" type="n_gram" multiValued="false" stored="true"/>
   <dynamicField name="std_*" type="text_std_token_lower_case" multiValued="false" stored="true"/>
   <dynamicField name="key_*" type="key_lower_case" multiValued="false" stored="true"/>
-  <dynamicField name="ws_*" type="text_ws" omitNorms="false" multiValued="false" stored="true"/>
+  <dynamicField name="ws_*" type="string" indexed="true" multiValued="false" stored="true"/>
 
   <dynamicField name="*_i"  type="tint" indexed="true"  stored="true"/>
   <dynamicField name="*_is" type="tints" indexed="true"  stored="true"/>
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/input.config-ambari.json.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/input.config-ambari.json.j2
index 9ec651cb8c..237740acac 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/input.config-ambari.json.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/input.config-ambari.json.j2
@@ -309,6 +309,11 @@
             "new_fieldname":"action"
           }
         },
+        "Service":{
+          "map_fieldname":{
+            "new_fieldname":"ws_service"
+          }
+        },
         "url":{
           "map_fieldname":{
             "new_fieldname":"resource"
@@ -324,6 +329,16 @@
             "new_fieldname":"cluster"
           }
         },
+        "Old name":{
+          "map_fieldname":{
+            "new_fieldname":"ws_old_name"
+          }
+        },
+        "New name":{
+          "map_fieldname":{
+            "new_fieldname":"ws_new_name"
+          }
+        },
         "Reason":{
           "map_fieldname":{
             "new_fieldname":"reason"
@@ -334,6 +349,11 @@
             "new_fieldname":"ws_base_url"
           }
         },
+        "Base url":{
+          "map_fieldname":{
+            "new_fieldname":"ws_base_url"
+          }
+        },
         "Command":{
           "map_fieldvalue":{
             "pre_value":"null",
@@ -348,11 +368,146 @@
             "new_fieldname":"ws_component"
           }
         },
+        "Type":{
+          "map_fieldname":{
+            "new_fieldname":"ws_type"
+          }
+        },
+        "Consecutive failures": {
+          "map_fieldname":{
+            "new_fieldname":"ws_consecutive_failures"
+          }
+        },
+        "Created Username": {
+          "map_fieldname":{
+            "new_fieldname":"ws_username"
+          }
+        },
+        "Affected username": {
+          "map_fieldname":{
+            "new_fieldname":"ws_username"
+          }
+        },
+        "Deleted Username": {
+          "map_fieldname":{
+            "new_fieldname":"ws_username"
+          }
+        },
+        "Alert group name": {
+          "map_fieldname":{
+            "new_fieldname":"ws_alert_group_name"
+          }
+        },
+        "Alert group ID": {
+          "map_fieldname":{
+            "new_fieldname":"ws_alert_group_id"
+          }
+        },
+        "Definition IDs": {
+          "map_fieldname":{
+            "new_fieldname":"std_alert_definition_ids"
+          }
+        },
+        "Notification ID": {
+          "map_fieldname":{
+            "new_fieldname":"ws_alert_notification_id"
+          }
+        },
+        "Notification IDs": {
+          "map_fieldname":{
+            "new_fieldname":"std_alert_notification_ids"
+          }
+        },
+        "Notification name": {
+          "map_fieldname":{
+            "new_fieldname":"ws_alert_notification_name"
+          }
+        },
+        "Notification type": {
+          "map_fieldname":{
+            "new_fieldname":"ws_alert_notification_type"
+          }
+        },
+        "Members": {
+          "map_fieldname":{
+            "new_fieldname":"std_members"
+          }
+        },
+        "Description": {
+          "map_fieldname":{
+            "new_fieldname":"ws_description"
+          }
+        },
+        "Email from": {
+          "map_fieldname":{
+            "new_fieldname":"ws_alert_email_from"
+          }
+        },
+        "Email to": {
+          "map_fieldname":{
+            "new_fieldname":"ws_alert_email_to"
+          }
+        },
+        "Group": {
+          "map_fieldname":{
+            "new_fieldname":"ws_group"
+          }
+        },
+        "Group IDs": {
+          "map_fieldname":{
+            "new_fieldname":"std_alert_group_ids"
+          }
+        },
+        "Alert states": {
+          "map_fieldname":{
+            "new_fieldname":"std_alert_states"
+          }
+        },
+        "Blueprint": {
+          "map_fieldname":{
+            "new_fieldname":"ws_blueprint"
+          }
+        },
+        "Blueprint name": {
+          "map_fieldname":{
+            "new_fieldname":"ws_blueprint_name"
+          }
+        },
+        "State": {
+          "map_fieldname":{
+            "new_fieldname":"ws_state"
+          }
+        },
+        "Principal": {
+          "map_fieldname":{
+            "new_fieldname":"ws_principal"
+          }
+        },
+        "Alias": {
+          "map_fieldname":{
+            "new_fieldname":"ws_alias"
+          }
+        },
+        "Keytab file": {
+          "map_fieldname":{
+            "new_fieldname":"ws_keytab_file"
+          }
+        },
+        "Upgrade type":{
+          "map_fieldname":{
+            "new_fieldname":"ws_upgrade_type"
+          }
+        },
         "Details":{
           "map_fieldname":{
             "new_fieldname":"ws_details"
           }
         },
+        "Name":{
+          "map_fieldname":{
+            "new_fieldname":"ws_name"
+          }
+        },
         "Display name":{
           "map_fieldvalue":{
             "pre_value":"null",
@@ -381,6 +536,11 @@
             "new_fieldname":"ws_repo_version"
           }
         },
+        "Repo version ID":{
+          "map_fieldname":{
+            "new_fieldname":"ws_repo_version_id"
+          }
+        },
         "Repositories":{
           "map_fieldname":{
             "new_fieldname":"ws_repositories"
@@ -391,11 +551,31 @@
             "new_fieldname":"ws_request_id"
           }
         },
+        "Request id":{
+          "map_fieldname":{
+            "new_fieldname":"ws_request_id"
+          }
+        },
+        "Repository ID":{
+          "map_fieldname":{
+            "new_fieldname":"ws_repo_id"
+          }
+        },
+        "Repository name":{
+          "map_fieldname":{
+            "new_fieldname":"ws_repo_name"
+          }
+        },
         "Roles":{
           "map_fieldname":{
             "new_fieldname":"ws_roles"
           }
         },
+        "Permissions":{
+          "map_fieldname":{
+            "new_fieldname":"std_permissions"
+          }
+        },
         "Stack":{
           "map_fieldname":{
             "new_fieldname":"ws_stack"
@@ -406,6 +586,42 @@
             "new_fieldname":"ws_stack_version"
           }
         },
+        "Stage id":{
+          "map_fieldname":{
+            "new_fieldname":"ws_stage_id"
+          }
+        },
+        "Administrator":{
+          "map_fieldvalue":{
+            "pre_value":"yes",
+            "post_value":"1"
+          },
+          "map_fieldvalue":{
+            "pre_value":"no",
+            "post_value":"0"
+          },
+          "map_fieldname":{
+            "new_fieldname":"ws_admin"
+          }
+        },
+        "Active":{
+          "map_fieldvalue":{
+            "pre_value":"y",
+            "post_value":"1"
+          },
+          "map_fieldvalue":{
+            "pre_value":"n",
+            "post_value":"0"
+          },
+          "map_fieldname":{
+            "new_fieldname":"ws_active"
+          }
+        },
+        "Version":{
+          "map_fieldname":{
+            "new_fieldname":"ws_version"
+          }
+        },
         "VersionNote":{
           "map_fieldvalue":{
             "pre_value":"null",