From 71bd84c0aa9d1c87a7e6a66ed9d9a40f4de72461 Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Wed, 29 Aug 2018 21:45:05 +0000 Subject: fixing make error? Issue-ID: LOG-612 Change-Id: I3a9fcbff2bf04a2d120ba3fdb0a3b0ada3083b1d Signed-off-by: Prudence Au Signed-off-by: Mandeep Khinda Signed-off-by: Michael O'Brien --- .../pomba/charts/pomba-search-data/Chart.yaml | 2 +- .../resources/config/analysis-config.json | 51 +++++++++++----------- .../resources/config/auth/search_policy.json | 43 ++++++++---------- .../resources/config/dynamic-custom-template.json | 22 +++++----- .../resources/config/elastic-search.properties | 2 +- .../resources/config/es-payload-translation.json | 3 +- .../resources/config/filter-config.json | 12 +++-- .../resources/config/log/logback.xml | 26 ++++------- 8 files changed, 70 insertions(+), 91 deletions(-) (limited to 'kubernetes/pomba/charts') diff --git a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml b/kubernetes/pomba/charts/pomba-search-data/Chart.yaml index 89e7917206..ef0e5d6973 100644 --- a/kubernetes/pomba/charts/pomba-search-data/Chart.yaml +++ b/kubernetes/pomba/charts/pomba-search-data/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright © 2018 Amdocs +# Copyright © 2018 Amdocs # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json index dce0e40b98..0927d98748 100644 --- a/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json +++ b/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json @@ -1,32 +1,31 @@ -[ - { +[{ "name": "whitespace_analyzer", - "description": "A standard whitespace analyzer.", - "behaviours": [ - "Tokenize the text using white space characters as delimeters.", - "Convert all characters to lower case.", - "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents." - ], - "tokenizer": "whitespace", - "filters": [ - "lowercase", - "asciifolding" - ] + "description": "A standard whitespace analyzer.", + "behaviours": [ + "Tokenize the text using white space characters as delimeters.", + "Convert all characters to lower case.", + "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents." + ], + "tokenizer": "whitespace", + "filters": [ + "lowercase", + "asciifolding" + ] }, { "name": "ngram_analyzer", - "description": "An analyzer which performs ngram filtering on the data stream.", - "behaviours": [ - "Tokenize the text using white space characters as delimeters.", - "Convert all characters to lower case.", - "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.", - "Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2." - ], - "tokenizer": "whitespace", - "filters": [ - "lowercase", - "asciifolding", - "ngram_filter" - ] + "description": "An analyzer which performs ngram filtering on the data stream.", + "behaviours": [ + "Tokenize the text using white space characters as delimeters.", + "Convert all characters to lower case.", + "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.", + "Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2." + ], + "tokenizer": "whitespace", + "filters": [ + "lowercase", + "asciifolding", + "ngram_filter" + ] } ] \ No newline at end of file diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json index a83422753d..00a6de5f4a 100644 --- a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json +++ b/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json @@ -1,31 +1,24 @@ { - "roles": [ - { - "name": "admin", - "functions": [ + "roles": [{ + "name": "admin", + "functions": [{ + "name": "search", + "methods": [{ + "name": "GET" + }, { - "name": "search", - "methods": [ - { - "name": "GET" - }, - { - "name": "DELETE" - }, - { - "name": "PUT" - }, - { - "name": "POST" - } - ] - } - ], - "users": [ + "name": "DELETE" + }, + { + "name": "PUT" + }, { - "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA" + "name": "POST" } ] - } - ] + }], + "users": [{ + "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA" + }] + }] } \ No newline at end of file diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json index b0eb539443..0bd8686f85 100644 --- a/kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json +++ b/kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json @@ -1,12 +1,10 @@ -"dynamic_templates":[ - { - "strings":{ - "match_mapping_type":"string", - "match": "*", - "mapping":{ - "type":"text", - "fielddata":true - } - } - } -], +"dynamic_templates": [{ + "strings": { + "match_mapping_type": "string", + "match": "*", + "mapping": { + "type": "text", + "fielddata": true + } + } +}], \ No newline at end of file diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties b/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties index b5c7feed94..3048e6019e 100644 --- a/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties +++ b/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties @@ -2,4 +2,4 @@ es.cluster-name=POMBA_ES es.ip-address=pomba-es.{{.Release.Namespace}} -es.http-port={{ .Values.config.elasticsearchHttpPort }} +es.http-port={{.Values.config.elasticsearchHttpPort}} diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json index 93888befbc..de8bacf4cb 100644 --- a/kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json +++ b/kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json @@ -1,6 +1,5 @@ { - "attr-translations": [ - { + "attr-translations": [{ "from": "\"type\":\"string\",\"index\":\"analyzed\"", "to": "\"type\":\"text\",\"index\":\"true\"" }, diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json index e2d5285824..5f9120e889 100644 --- a/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json +++ b/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json @@ -1,7 +1,5 @@ -[ - { - "name": "ngram_filter", - "description": "Custom NGram Filter.", - "configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]" - } -] \ No newline at end of file +[{ + "name": "ngram_filter", + "description": "Custom NGram Filter.", + "configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]" +}] \ No newline at end of file diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml b/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml index 3fbbbab864..bfca544fe0 100644 --- a/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml +++ b/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml @@ -2,7 +2,7 @@ - + - + ${logDirectory}/${generalLogName}.log - + ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip 60 @@ -63,11 +61,9 @@ Policy engine events from other components, or it can be eliminated to record these events as part of the application root log. --> - + ${logDirectory}/${auditLogName}.log - + ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip 60 @@ -81,11 +77,9 @@ - + ${logDirectory}/${metricsLogName}.log - + ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip 60 @@ -103,11 +97,9 @@ - + ${logDirectory}/${debugLogName}.log - + ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip 60 -- cgit 1.2.3-korg