aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/pomba/charts
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2018-08-29 21:45:05 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2018-08-29 21:45:05 +0000
commit71bd84c0aa9d1c87a7e6a66ed9d9a40f4de72461 (patch)
tree668e799d9d8c27d1c188e5a1c50c159b0efa6e17 /kubernetes/pomba/charts
parent2eadea6daf3ec711a38e6c2bd72c6594c17da1af (diff)
fixing make error?
Issue-ID: LOG-612 Change-Id: I3a9fcbff2bf04a2d120ba3fdb0a3b0ada3083b1d Signed-off-by: Prudence Au <prudence.au@amdocs.com> Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com> Signed-off-by: Michael O'Brien <frank.obrien@amdocs.com>
Diffstat (limited to 'kubernetes/pomba/charts')
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/Chart.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json51
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json43
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json22
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties2
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json3
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json12
-rw-r--r--kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml26
8 files changed, 70 insertions, 91 deletions
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 @@
<!--<jmxConfigurator /> -->
<!-- directory path for all other type logs -->
- <property name="logDir" value="/var/log/onap" />
+ <property name="logDir" value="/var/log/onap" />
<!-- specify the component name
@@ -34,11 +34,9 @@
<!-- The EELFAppender is used to record events to the general application
log -->
- <appender name="EELF"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <appender name="EELF" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logDirectory}/${generalLogName}.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
</fileNamePattern>
<maxHistory>60</maxHistory>
@@ -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. -->
- <appender name="EELFAudit"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logDirectory}/${auditLogName}.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
</fileNamePattern>
<maxHistory>60</maxHistory>
@@ -81,11 +77,9 @@
<appender-ref ref="EELFAudit" />
</appender>
- <appender name="EELFMetrics"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logDirectory}/${metricsLogName}.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
</fileNamePattern>
<maxHistory>60</maxHistory>
@@ -103,11 +97,9 @@
<appender-ref ref="EELFMetrics"/>
</appender>
- <appender name="EELFDebug"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logDirectory}/${debugLogName}.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip
</fileNamePattern>
<maxHistory>60</maxHistory>