summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan Yang <yangyanyj@chinamobile.com>2019-04-25 00:09:53 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-25 00:09:53 +0000
commitee2d04774ed2ccb1f504e4cdba972ef85d8fac77 (patch)
tree2597b3741f16d62115c52bf88b246bd4771738ad
parent25bfb9c2139dcd466b8a920469bebff1d720931d (diff)
parentd60e73f612c8263268e30d0e595b6414b7d2fa64 (diff)
Merge "3 data mappings for ES"
-rw-r--r--components/datalake-handler/feeder/src/main/resources/druid/unauthenticated.DCAE_CL_OUTPUT-sample-format.json12
-rw-r--r--components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/aai-event.json18
-rw-r--r--components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/unauthenticated.dcae_cl_output.json22
-rw-r--r--components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/unauthenticated.sec_fault_output.json22
4 files changed, 69 insertions, 5 deletions
diff --git a/components/datalake-handler/feeder/src/main/resources/druid/unauthenticated.DCAE_CL_OUTPUT-sample-format.json b/components/datalake-handler/feeder/src/main/resources/druid/unauthenticated.DCAE_CL_OUTPUT-sample-format.json
index 8de08f76..2f13f98a 100644
--- a/components/datalake-handler/feeder/src/main/resources/druid/unauthenticated.DCAE_CL_OUTPUT-sample-format.json
+++ b/components/datalake-handler/feeder/src/main/resources/druid/unauthenticated.DCAE_CL_OUTPUT-sample-format.json
@@ -1,5 +1,7 @@
{
- "_id": "5bb3d3ad5bea3f41300959ba",
+ "_id": {
+ "$oid": "5bb3d3ad5bea3f41300959ba"
+ },
"closedLoopEventClient": "DCAE.HolmesInstance",
"policyVersion": "1.0.0.5",
"policyName": "CCVPN",
@@ -12,14 +14,14 @@
"vserver_vserver-name": "TBD",
"network-information_network-id": "providerId%2F5555%2FclientId%2F6666%2FtopologyId%2F200"
},
- "closedLoopAlarmStart": "1532769303924000",
+ "closedLoopAlarmStart": 1532769303924,
"closedLoopEventStatus": "ONSET",
"version": "1.0.2",
"closedLoopControlName": "ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c66b",
"target": "vserver.vserver-name",
- "closedLoopAlarmEnd": "1532769303924000",
+ "closedLoopAlarmEnd": 1532769303924,
"requestID": "6f455b14-efd9-450a-bf78-e47d55b6da87",
"from": "DCAE",
"_dl_type_": "JSON",
- "_dl_text_": "{\"closedLoopEventClient\":\"DCAE.HolmesInstance\",\"policyVersion\":\"1.0.0.5\",\"policyName\":\"CCVPN\",\"policyScope\":\"service=SOTNService,type=SampleType,closedLoopControlName=CL-CCVPN-d925ed73-8231-4d02-9545-db4e101f88f8\",\"target_type\":\"VM\",\"AAI\":{\"serviceType\":\"TestService\",\"service-instance.service-instance-id\":\"200\",\"globalSubscriberId\":\"Customer1\",\"vserver.vserver-name\":\"TBD\",\"network-information.network-id\":\"providerId%2F5555%2FclientId%2F6666%2FtopologyId%2F200\"},\"closedLoopAlarmStart\":1532769303924000,\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"closedLoopControlName\":\"ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c66b\",\"target\":\"vserver.vserver-name\",\"closedLoopAlarmEnd\":1532769303924000,\"requestID\":\"6f455b14-efd9-450a-bf78-e47d55b6da87\",\"from\":\"DCAE\"}"
-} \ No newline at end of file
+ "_dl_text_": "{\"closedLoopEventClient\":\"DCAE.HolmesInstance\",\"policyVersion\":\"1.0.0.5\",\"policyName\":\"CCVPN\",\"policyScope\":\"service=SOTNService,type=SampleType,closedLoopControlName=CL-CCVPN-d925ed73-8231-4d02-9545-db4e101f88f8\",\"target_type\":\"VM\",\"AAI\":{\"serviceType\":\"TestService\",\"service-instance.service-instance-id\":\"200\",\"globalSubscriberId\":\"Customer1\",\"vserver.vserver-name\":\"TBD\",\"network-information.network-id\":\"providerId%2F5555%2FclientId%2F6666%2FtopologyId%2F200\"},\"closedLoopAlarmStart\":1532769303924,\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"closedLoopControlName\":\"ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c66b\",\"target\":\"vserver.vserver-name\",\"closedLoopAlarmEnd\":1532769303924,\"requestID\":\"6f455b14-efd9-450a-bf78-e47d55b6da87\",\"from\":\"DCAE\"}"
+}
diff --git a/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/aai-event.json b/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/aai-event.json
new file mode 100644
index 00000000..e727ef5f
--- /dev/null
+++ b/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/aai-event.json
@@ -0,0 +1,18 @@
+{
+ "template":"aai-event",
+ "order":1,
+ "mappings":{
+ "_default_":{
+ "properties":{
+ "datalake_ts_":{
+ "type":"date",
+ "format":"epoch_millis"
+ },
+ "event-header.timestamp":{
+ "type":"date",
+ "format":"yyyyMMdd-HH:mm:ss:SSS"
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/unauthenticated.dcae_cl_output.json b/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/unauthenticated.dcae_cl_output.json
new file mode 100644
index 00000000..0e597fab
--- /dev/null
+++ b/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/unauthenticated.dcae_cl_output.json
@@ -0,0 +1,22 @@
+{
+ "template":"unauthenticated.dcae_cl_output",
+ "order":1,
+ "mappings":{
+ "_default_":{
+ "properties":{
+ "datalake_ts_":{
+ "type":"date",
+ "format":"epoch_millis"
+ },
+ "closedLoopAlarmStart":{
+ "type":"date",
+ "format":"epoch_millis"
+ },
+ "closedLoopAlarmEnd":{
+ "type":"date",
+ "format":"epoch_millis"
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/unauthenticated.sec_fault_output.json b/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/unauthenticated.sec_fault_output.json
new file mode 100644
index 00000000..319b4acc
--- /dev/null
+++ b/components/datalake-handler/feeder/src/main/resources/elasticsearch/mappings/unauthenticated.sec_fault_output.json
@@ -0,0 +1,22 @@
+{
+ "template":"unauthenticated.sec_fault_output",
+ "order":1,
+ "mappings":{
+ "_default_":{
+ "properties":{
+ "datalake_ts_":{
+ "type":"date",
+ "format":"epoch_millis"
+ },
+ "event.commonEventHeader.startEpochMicrosec":{
+ "type":"date",
+ "format":"epoch_millis"
+ },
+ "event.commonEventHeader.lastEpochMicrosec":{
+ "type":"date",
+ "format":"epoch_millis"
+ }
+ }
+ }
+ }
+} \ No newline at end of file