From 0228c6167e0157ddac9ec0b76b69e7a221078e2a Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 11:36:07 +0530 Subject: [PATCH 01/37] Reduce to one command in scalable-integrator --- .../templates/integrator-deployment.yaml | 0 .../templates/integrator-gateway-ingress.yaml | 0 .../templates/integrator-gateway-service.yaml | 0 .../templates/integrator-ingress.yaml | 0 .../templates/integrator-service.yaml | 0 .../templates/integrator-volume-claim.yaml | 0 .../templates/namespace.yaml | 19 ----------- .../.helmignore | 21 ------------ .../scalable-integrator-deployment/Chart.yaml | 19 ----------- .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 32 ------------------- .../values.yaml | 2 -- 12 files changed, 93 deletions(-) rename helm/scalable-integrator/{scalable-integrator-deployment => scalable-integrator-conf}/templates/integrator-deployment.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-deployment => scalable-integrator-conf}/templates/integrator-gateway-ingress.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-deployment => scalable-integrator-conf}/templates/integrator-gateway-service.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-deployment => scalable-integrator-conf}/templates/integrator-ingress.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-deployment => scalable-integrator-conf}/templates/integrator-service.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-deployment => scalable-integrator-conf}/templates/integrator-volume-claim.yaml (100%) delete mode 100644 helm/scalable-integrator/scalable-integrator-conf/templates/namespace.yaml delete mode 100644 helm/scalable-integrator/scalable-integrator-deployment/.helmignore delete mode 100644 helm/scalable-integrator/scalable-integrator-deployment/Chart.yaml delete mode 100644 helm/scalable-integrator/scalable-integrator-deployment/templates/NOTES.txt delete mode 100644 helm/scalable-integrator/scalable-integrator-deployment/templates/_helpers.tpl delete mode 100644 helm/scalable-integrator/scalable-integrator-deployment/values.yaml diff --git a/helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-deployment.yaml b/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-deployment.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-deployment.yaml rename to helm/scalable-integrator/scalable-integrator-conf/templates/integrator-deployment.yaml diff --git a/helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-gateway-ingress.yaml b/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-gateway-ingress.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-gateway-ingress.yaml rename to helm/scalable-integrator/scalable-integrator-conf/templates/integrator-gateway-ingress.yaml diff --git a/helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-gateway-service.yaml b/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-gateway-service.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-gateway-service.yaml rename to helm/scalable-integrator/scalable-integrator-conf/templates/integrator-gateway-service.yaml diff --git a/helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-ingress.yaml b/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-ingress.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-ingress.yaml rename to helm/scalable-integrator/scalable-integrator-conf/templates/integrator-ingress.yaml diff --git a/helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-service.yaml b/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-service.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-service.yaml rename to helm/scalable-integrator/scalable-integrator-conf/templates/integrator-service.yaml diff --git a/helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-volume-claim.yaml b/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-volume-claim.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-deployment/templates/integrator-volume-claim.yaml rename to helm/scalable-integrator/scalable-integrator-conf/templates/integrator-volume-claim.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/namespace.yaml b/helm/scalable-integrator/scalable-integrator-conf/templates/namespace.yaml deleted file mode 100644 index c2811ffc..00000000 --- a/helm/scalable-integrator/scalable-integrator-conf/templates/namespace.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Namespace -metadata: - name: {{ .Values.namespace }} - namespace: "" diff --git a/helm/scalable-integrator/scalable-integrator-deployment/.helmignore b/helm/scalable-integrator/scalable-integrator-deployment/.helmignore deleted file mode 100644 index f0c13194..00000000 --- a/helm/scalable-integrator/scalable-integrator-deployment/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/helm/scalable-integrator/scalable-integrator-deployment/Chart.yaml b/helm/scalable-integrator/scalable-integrator-deployment/Chart.yaml deleted file mode 100644 index 55f991cc..00000000 --- a/helm/scalable-integrator/scalable-integrator-deployment/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the deployment of WSO2 EI Integrator profile -name: scalable-integrator-deployment -version: 1.0.0 diff --git a/helm/scalable-integrator/scalable-integrator-deployment/templates/NOTES.txt b/helm/scalable-integrator/scalable-integrator-deployment/templates/NOTES.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/helm/scalable-integrator/scalable-integrator-deployment/templates/_helpers.tpl b/helm/scalable-integrator/scalable-integrator-deployment/templates/_helpers.tpl deleted file mode 100644 index 80552040..00000000 --- a/helm/scalable-integrator/scalable-integrator-deployment/templates/_helpers.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "scalable-integrator-deployment.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "scalable-integrator-deployment.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "scalable-integrator-deployment.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/helm/scalable-integrator/scalable-integrator-deployment/values.yaml b/helm/scalable-integrator/scalable-integrator-deployment/values.yaml deleted file mode 100644 index d3d1e917..00000000 --- a/helm/scalable-integrator/scalable-integrator-deployment/values.yaml +++ /dev/null @@ -1,2 +0,0 @@ -namespace: "wso2" -svcaccount: "wso2svc-account" From 96ec78cab12fdb0da3f238117624f86f1c488b77 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 11:50:27 +0530 Subject: [PATCH 02/37] Change chart name to scable-integrator --- .../.helmignore | 0 .../Chart.yaml | 8 ++++---- .../auth.json | 0 .../confs/axis2/axis2.xml | 0 .../confs/carbon.xml | 0 .../confs/datasources/master-datasources.xml | 0 .../confs/registry.xml | 0 .../confs/user-mgt.xml | 0 .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/integrator-conf-axis2.yaml | 0 .../templates/integrator-conf-datasources.yaml | 0 .../templates/integrator-conf.yaml | 0 .../templates/integrator-deployment.yaml | 0 .../templates/integrator-gateway-ingress.yaml | 0 .../templates/integrator-gateway-service.yaml | 0 .../templates/integrator-ingress.yaml | 0 .../templates/integrator-service.yaml | 0 .../templates/integrator-volume-claim.yaml | 0 .../templates/persistent-volumes.yaml | 0 .../templates/rbac.yaml | 0 .../templates/secrets.yaml | 0 .../templates/svcaccount.yaml | 0 .../values.yaml | 0 24 files changed, 4 insertions(+), 4 deletions(-) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/.helmignore (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/Chart.yaml (88%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/auth.json (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/confs/axis2/axis2.xml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/confs/carbon.xml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/confs/datasources/master-datasources.xml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/confs/registry.xml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/confs/user-mgt.xml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/NOTES.txt (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/_helpers.tpl (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-conf-axis2.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-conf-datasources.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-conf.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-deployment.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-gateway-ingress.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-gateway-service.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-ingress.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-service.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/integrator-volume-claim.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/persistent-volumes.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/rbac.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/secrets.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/templates/svcaccount.yaml (100%) rename helm/scalable-integrator/{scalable-integrator-conf => scalable-integrator}/values.yaml (100%) diff --git a/helm/scalable-integrator/scalable-integrator-conf/.helmignore b/helm/scalable-integrator/scalable-integrator/.helmignore similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/.helmignore rename to helm/scalable-integrator/scalable-integrator/.helmignore diff --git a/helm/scalable-integrator/scalable-integrator-conf/Chart.yaml b/helm/scalable-integrator/scalable-integrator/Chart.yaml similarity index 88% rename from helm/scalable-integrator/scalable-integrator-conf/Chart.yaml rename to helm/scalable-integrator/scalable-integrator/Chart.yaml index 63d2f1d7..4044674a 100644 --- a/helm/scalable-integrator/scalable-integrator-conf/Chart.yaml +++ b/helm/scalable-integrator/scalable-integrator/Chart.yaml @@ -13,7 +13,7 @@ # limitations under the License. apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the deployment of WSO2 EI Integrator profile configurations -name: scalable-integrator-conf -version: 1.0.0 +appVersion: "6.3.0-2" +description: A Helm chart for the deployment of WSO2 EI Integrator profile +name: scalable-integrator +version: 6.3.0-2 diff --git a/helm/scalable-integrator/scalable-integrator-conf/auth.json b/helm/scalable-integrator/scalable-integrator/auth.json similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/auth.json rename to helm/scalable-integrator/scalable-integrator/auth.json diff --git a/helm/scalable-integrator/scalable-integrator-conf/confs/axis2/axis2.xml b/helm/scalable-integrator/scalable-integrator/confs/axis2/axis2.xml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/confs/axis2/axis2.xml rename to helm/scalable-integrator/scalable-integrator/confs/axis2/axis2.xml diff --git a/helm/scalable-integrator/scalable-integrator-conf/confs/carbon.xml b/helm/scalable-integrator/scalable-integrator/confs/carbon.xml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/confs/carbon.xml rename to helm/scalable-integrator/scalable-integrator/confs/carbon.xml diff --git a/helm/scalable-integrator/scalable-integrator-conf/confs/datasources/master-datasources.xml b/helm/scalable-integrator/scalable-integrator/confs/datasources/master-datasources.xml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/confs/datasources/master-datasources.xml rename to helm/scalable-integrator/scalable-integrator/confs/datasources/master-datasources.xml diff --git a/helm/scalable-integrator/scalable-integrator-conf/confs/registry.xml b/helm/scalable-integrator/scalable-integrator/confs/registry.xml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/confs/registry.xml rename to helm/scalable-integrator/scalable-integrator/confs/registry.xml diff --git a/helm/scalable-integrator/scalable-integrator-conf/confs/user-mgt.xml b/helm/scalable-integrator/scalable-integrator/confs/user-mgt.xml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/confs/user-mgt.xml rename to helm/scalable-integrator/scalable-integrator/confs/user-mgt.xml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/NOTES.txt b/helm/scalable-integrator/scalable-integrator/templates/NOTES.txt similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/NOTES.txt rename to helm/scalable-integrator/scalable-integrator/templates/NOTES.txt diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/_helpers.tpl b/helm/scalable-integrator/scalable-integrator/templates/_helpers.tpl similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/_helpers.tpl rename to helm/scalable-integrator/scalable-integrator/templates/_helpers.tpl diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-conf-axis2.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-conf-axis2.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-conf-axis2.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-conf-axis2.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-conf-datasources.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-conf-datasources.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-conf-datasources.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-conf-datasources.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-conf.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-conf.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-conf.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-conf.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-deployment.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-deployment.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-deployment.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-deployment.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-gateway-ingress.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-gateway-ingress.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-gateway-ingress.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-gateway-ingress.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-gateway-service.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-gateway-service.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-gateway-service.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-gateway-service.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-ingress.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-ingress.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-ingress.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-ingress.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-service.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-service.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-service.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-service.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/integrator-volume-claim.yaml b/helm/scalable-integrator/scalable-integrator/templates/integrator-volume-claim.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/integrator-volume-claim.yaml rename to helm/scalable-integrator/scalable-integrator/templates/integrator-volume-claim.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/persistent-volumes.yaml b/helm/scalable-integrator/scalable-integrator/templates/persistent-volumes.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/persistent-volumes.yaml rename to helm/scalable-integrator/scalable-integrator/templates/persistent-volumes.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/rbac.yaml b/helm/scalable-integrator/scalable-integrator/templates/rbac.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/rbac.yaml rename to helm/scalable-integrator/scalable-integrator/templates/rbac.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/secrets.yaml b/helm/scalable-integrator/scalable-integrator/templates/secrets.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/secrets.yaml rename to helm/scalable-integrator/scalable-integrator/templates/secrets.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/templates/svcaccount.yaml b/helm/scalable-integrator/scalable-integrator/templates/svcaccount.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/templates/svcaccount.yaml rename to helm/scalable-integrator/scalable-integrator/templates/svcaccount.yaml diff --git a/helm/scalable-integrator/scalable-integrator-conf/values.yaml b/helm/scalable-integrator/scalable-integrator/values.yaml similarity index 100% rename from helm/scalable-integrator/scalable-integrator-conf/values.yaml rename to helm/scalable-integrator/scalable-integrator/values.yaml From 8805ec7fe722915481f0e0713a1c7428c9b09126 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 11:57:56 +0530 Subject: [PATCH 03/37] Add NOTE.txt template to scable-integrator --- .../scalable-integrator/templates/NOTES.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/helm/scalable-integrator/scalable-integrator/templates/NOTES.txt b/helm/scalable-integrator/scalable-integrator/templates/NOTES.txt index e69de29b..0150b7bf 100644 --- a/helm/scalable-integrator/scalable-integrator/templates/NOTES.txt +++ b/helm/scalable-integrator/scalable-integrator/templates/NOTES.txt @@ -0,0 +1,5 @@ +Thank you for installing WSO2 Enterprise Integrator. + +Your release is named {{ .Release.Name }}. + +Please refer the official documentation at https://docs.wso2.com/display/EI630 From 0f4cdb654924b6320012e9fe176ee725323183e7 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 18:01:49 +0530 Subject: [PATCH 04/37] Change README.md of 'scalable-integrator' pattern --- helm/scalable-integrator/README.md | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/helm/scalable-integrator/README.md b/helm/scalable-integrator/README.md index 41ccade3..1da85ddc 100644 --- a/helm/scalable-integrator/README.md +++ b/helm/scalable-integrator/README.md @@ -29,10 +29,10 @@ git clone https://github.com/wso2/kubernetes-ei.git ##### 2. Provide configurations: -1. The default product configurations are available at `/scalable-integrator-conf/confs` folder. Change the +1. The default product configurations are available at `/scalable-integrator/confs` folder. Change the configurations as necessary. -2. Open the `/scalable-integrator-conf/values.yaml` and provide the following values. +2. Open the `/scalable-integrator/values.yaml` and provide the following values. `username`: Username of your Free Trial Subscription
`password`: Password of your Free Trial Subscription
@@ -41,19 +41,8 @@ configurations as necessary. `svcaccount`: Service Account
`serverIp`: NFS Server IP
`locationPath`: NFS location path - -3. Open the `/scalable-integrator-deployment/values.yaml` and provide the following values. - `namespace`: Namespace
- `svcaccount`: Service Account - -##### 3. Deploy the configurations: - -``` -helm install --name /scalable-integrator-conf -``` - -##### 4. Deploy MySql: +##### 3. Deploy MySql: If there is an external product database(s), add those configurations as stated at `step 2.1`. Otherwise, run the below command to create the product database. ``` @@ -62,13 +51,14 @@ stable/mysql --namespace ``` `NAMESPACE` should be same as `step 2.2`. -##### 5. Deploy WSO2 Enterprise Integrator: +##### 4. Deploy WSO2 Enterprise Integrator: ``` -helm install --name /scalable-integrator-deployment +helm install --name /scalable-integrator --namespace ``` +`NAMESPACE` should be same as `step 2.2`. -##### 6. Access Management Console: +##### 5. Access Management Console: Default deployment will expose two publicly accessible hosts, namely:
1. `wso2ei-scalable-integrator` - To expose Administrative services and Management Console
From 75cd7448e4be6d76af2f81c63d2f30f4d3893b31 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 18:11:41 +0530 Subject: [PATCH 05/37] Reduce to one command in scalable-mb --- .../templates/message-broker-deployment.yaml | 0 .../templates/message-broker-ingress.yaml | 0 .../templates/message-broker-service.yaml | 0 .../message-broker-volume-claim.yaml | 0 .../scalable-mb-conf/templates/namespace.yaml | 19 -------- .../scalable-mb-deployment/.helmignore | 35 -------------- .../scalable-mb-deployment/Chart.yaml | 19 -------- .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 48 ------------------- .../scalable-mb-deployment/values.yaml | 16 ------- 10 files changed, 137 deletions(-) rename helm/scalable-mb/{scalable-mb-deployment => scalable-mb-conf}/templates/message-broker-deployment.yaml (100%) rename helm/scalable-mb/{scalable-mb-deployment => scalable-mb-conf}/templates/message-broker-ingress.yaml (100%) rename helm/scalable-mb/{scalable-mb-deployment => scalable-mb-conf}/templates/message-broker-service.yaml (100%) rename helm/scalable-mb/{scalable-mb-deployment => scalable-mb-conf}/templates/message-broker-volume-claim.yaml (100%) delete mode 100644 helm/scalable-mb/scalable-mb-conf/templates/namespace.yaml delete mode 100644 helm/scalable-mb/scalable-mb-deployment/.helmignore delete mode 100644 helm/scalable-mb/scalable-mb-deployment/Chart.yaml delete mode 100644 helm/scalable-mb/scalable-mb-deployment/templates/NOTES.txt delete mode 100644 helm/scalable-mb/scalable-mb-deployment/templates/_helpers.tpl delete mode 100644 helm/scalable-mb/scalable-mb-deployment/values.yaml diff --git a/helm/scalable-mb/scalable-mb-deployment/templates/message-broker-deployment.yaml b/helm/scalable-mb/scalable-mb-conf/templates/message-broker-deployment.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-deployment/templates/message-broker-deployment.yaml rename to helm/scalable-mb/scalable-mb-conf/templates/message-broker-deployment.yaml diff --git a/helm/scalable-mb/scalable-mb-deployment/templates/message-broker-ingress.yaml b/helm/scalable-mb/scalable-mb-conf/templates/message-broker-ingress.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-deployment/templates/message-broker-ingress.yaml rename to helm/scalable-mb/scalable-mb-conf/templates/message-broker-ingress.yaml diff --git a/helm/scalable-mb/scalable-mb-deployment/templates/message-broker-service.yaml b/helm/scalable-mb/scalable-mb-conf/templates/message-broker-service.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-deployment/templates/message-broker-service.yaml rename to helm/scalable-mb/scalable-mb-conf/templates/message-broker-service.yaml diff --git a/helm/scalable-mb/scalable-mb-deployment/templates/message-broker-volume-claim.yaml b/helm/scalable-mb/scalable-mb-conf/templates/message-broker-volume-claim.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-deployment/templates/message-broker-volume-claim.yaml rename to helm/scalable-mb/scalable-mb-conf/templates/message-broker-volume-claim.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/namespace.yaml b/helm/scalable-mb/scalable-mb-conf/templates/namespace.yaml deleted file mode 100644 index c2811ffc..00000000 --- a/helm/scalable-mb/scalable-mb-conf/templates/namespace.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Namespace -metadata: - name: {{ .Values.namespace }} - namespace: "" diff --git a/helm/scalable-mb/scalable-mb-deployment/.helmignore b/helm/scalable-mb/scalable-mb-deployment/.helmignore deleted file mode 100644 index 05434e94..00000000 --- a/helm/scalable-mb/scalable-mb-deployment/.helmignore +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/helm/scalable-mb/scalable-mb-deployment/Chart.yaml b/helm/scalable-mb/scalable-mb-deployment/Chart.yaml deleted file mode 100644 index 2d88a302..00000000 --- a/helm/scalable-mb/scalable-mb-deployment/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for deployment of Message Broker profile -name: scalable-mb-deployment -version: 1.0.0 diff --git a/helm/scalable-mb/scalable-mb-deployment/templates/NOTES.txt b/helm/scalable-mb/scalable-mb-deployment/templates/NOTES.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/helm/scalable-mb/scalable-mb-deployment/templates/_helpers.tpl b/helm/scalable-mb/scalable-mb-deployment/templates/_helpers.tpl deleted file mode 100644 index 416c78c4..00000000 --- a/helm/scalable-mb/scalable-mb-deployment/templates/_helpers.tpl +++ /dev/null @@ -1,48 +0,0 @@ -{{/* -Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "scalable-mb-deployment.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "scalable-mb-deployment.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "scalable-mb-deployment.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/helm/scalable-mb/scalable-mb-deployment/values.yaml b/helm/scalable-mb/scalable-mb-deployment/values.yaml deleted file mode 100644 index 58076014..00000000 --- a/helm/scalable-mb/scalable-mb-deployment/values.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -namespace: "wso2" -svcaccount: "wso2svc-account" From 68303ac431772f90905a6dbc0f9aa6fde115f0aa Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 18:13:24 +0530 Subject: [PATCH 06/37] Change chart name to scalable-mb --- .../{scalable-mb-conf => scalable-mb}/.helmignore | 0 .../{scalable-mb-conf => scalable-mb}/Chart.yaml | 8 ++++---- .../{scalable-mb-conf => scalable-mb}/auth.json | 0 .../confs/axis2/axis2.xml | 0 .../{scalable-mb-conf => scalable-mb}/confs/broker.xml | 0 .../{scalable-mb-conf => scalable-mb}/confs/carbon.xml | 0 .../confs/datasources/master-datasources.xml | 0 .../confs/hazelcast.properties | 0 .../confs/log4j.properties | 0 .../{scalable-mb-conf => scalable-mb}/confs/registry.xml | 0 .../{scalable-mb-conf => scalable-mb}/confs/user-mgt.xml | 0 helm/scalable-mb/scalable-mb/templates/NOTES.txt | 5 +++++ .../templates/_helpers.tpl | 0 .../templates/integrator-conf-axis2.yaml | 0 .../templates/integrator-conf-datasources.yaml | 0 .../templates/integrator-conf.yaml | 0 .../templates/message-broker-deployment.yaml | 0 .../templates/message-broker-ingress.yaml | 0 .../templates/message-broker-service.yaml | 0 .../templates/message-broker-volume-claim.yaml | 0 .../templates/persistent-volumes.yaml | 0 .../{scalable-mb-conf => scalable-mb}/templates/rbac.yaml | 0 .../templates/secrets.yaml | 0 .../templates/svcaccount.yaml | 0 .../{scalable-mb-conf => scalable-mb}/values.yaml | 0 25 files changed, 9 insertions(+), 4 deletions(-) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/.helmignore (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/Chart.yaml (82%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/auth.json (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/confs/axis2/axis2.xml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/confs/broker.xml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/confs/carbon.xml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/confs/datasources/master-datasources.xml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/confs/hazelcast.properties (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/confs/log4j.properties (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/confs/registry.xml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/confs/user-mgt.xml (100%) create mode 100644 helm/scalable-mb/scalable-mb/templates/NOTES.txt rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/_helpers.tpl (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/integrator-conf-axis2.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/integrator-conf-datasources.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/integrator-conf.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/message-broker-deployment.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/message-broker-ingress.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/message-broker-service.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/message-broker-volume-claim.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/persistent-volumes.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/rbac.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/secrets.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/templates/svcaccount.yaml (100%) rename helm/scalable-mb/{scalable-mb-conf => scalable-mb}/values.yaml (100%) diff --git a/helm/scalable-mb/scalable-mb-conf/.helmignore b/helm/scalable-mb/scalable-mb/.helmignore similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/.helmignore rename to helm/scalable-mb/scalable-mb/.helmignore diff --git a/helm/scalable-mb/scalable-mb-conf/Chart.yaml b/helm/scalable-mb/scalable-mb/Chart.yaml similarity index 82% rename from helm/scalable-mb/scalable-mb-conf/Chart.yaml rename to helm/scalable-mb/scalable-mb/Chart.yaml index 685e691f..79c069cf 100644 --- a/helm/scalable-mb/scalable-mb-conf/Chart.yaml +++ b/helm/scalable-mb/scalable-mb/Chart.yaml @@ -13,7 +13,7 @@ # limitations under the License. apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for deploy Message Broker profile configurations -name: scalable-mb-conf -version: 1.0.0 +appVersion: "6.3.0-2" +description: A Helm chart for deploy Message Broker profile +name: scalable-mb +version: 6.3.0-2 diff --git a/helm/scalable-mb/scalable-mb-conf/auth.json b/helm/scalable-mb/scalable-mb/auth.json similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/auth.json rename to helm/scalable-mb/scalable-mb/auth.json diff --git a/helm/scalable-mb/scalable-mb-conf/confs/axis2/axis2.xml b/helm/scalable-mb/scalable-mb/confs/axis2/axis2.xml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/confs/axis2/axis2.xml rename to helm/scalable-mb/scalable-mb/confs/axis2/axis2.xml diff --git a/helm/scalable-mb/scalable-mb-conf/confs/broker.xml b/helm/scalable-mb/scalable-mb/confs/broker.xml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/confs/broker.xml rename to helm/scalable-mb/scalable-mb/confs/broker.xml diff --git a/helm/scalable-mb/scalable-mb-conf/confs/carbon.xml b/helm/scalable-mb/scalable-mb/confs/carbon.xml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/confs/carbon.xml rename to helm/scalable-mb/scalable-mb/confs/carbon.xml diff --git a/helm/scalable-mb/scalable-mb-conf/confs/datasources/master-datasources.xml b/helm/scalable-mb/scalable-mb/confs/datasources/master-datasources.xml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/confs/datasources/master-datasources.xml rename to helm/scalable-mb/scalable-mb/confs/datasources/master-datasources.xml diff --git a/helm/scalable-mb/scalable-mb-conf/confs/hazelcast.properties b/helm/scalable-mb/scalable-mb/confs/hazelcast.properties similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/confs/hazelcast.properties rename to helm/scalable-mb/scalable-mb/confs/hazelcast.properties diff --git a/helm/scalable-mb/scalable-mb-conf/confs/log4j.properties b/helm/scalable-mb/scalable-mb/confs/log4j.properties similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/confs/log4j.properties rename to helm/scalable-mb/scalable-mb/confs/log4j.properties diff --git a/helm/scalable-mb/scalable-mb-conf/confs/registry.xml b/helm/scalable-mb/scalable-mb/confs/registry.xml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/confs/registry.xml rename to helm/scalable-mb/scalable-mb/confs/registry.xml diff --git a/helm/scalable-mb/scalable-mb-conf/confs/user-mgt.xml b/helm/scalable-mb/scalable-mb/confs/user-mgt.xml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/confs/user-mgt.xml rename to helm/scalable-mb/scalable-mb/confs/user-mgt.xml diff --git a/helm/scalable-mb/scalable-mb/templates/NOTES.txt b/helm/scalable-mb/scalable-mb/templates/NOTES.txt new file mode 100644 index 00000000..0150b7bf --- /dev/null +++ b/helm/scalable-mb/scalable-mb/templates/NOTES.txt @@ -0,0 +1,5 @@ +Thank you for installing WSO2 Enterprise Integrator. + +Your release is named {{ .Release.Name }}. + +Please refer the official documentation at https://docs.wso2.com/display/EI630 diff --git a/helm/scalable-mb/scalable-mb-conf/templates/_helpers.tpl b/helm/scalable-mb/scalable-mb/templates/_helpers.tpl similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/_helpers.tpl rename to helm/scalable-mb/scalable-mb/templates/_helpers.tpl diff --git a/helm/scalable-mb/scalable-mb-conf/templates/integrator-conf-axis2.yaml b/helm/scalable-mb/scalable-mb/templates/integrator-conf-axis2.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/integrator-conf-axis2.yaml rename to helm/scalable-mb/scalable-mb/templates/integrator-conf-axis2.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/integrator-conf-datasources.yaml b/helm/scalable-mb/scalable-mb/templates/integrator-conf-datasources.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/integrator-conf-datasources.yaml rename to helm/scalable-mb/scalable-mb/templates/integrator-conf-datasources.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/integrator-conf.yaml b/helm/scalable-mb/scalable-mb/templates/integrator-conf.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/integrator-conf.yaml rename to helm/scalable-mb/scalable-mb/templates/integrator-conf.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/message-broker-deployment.yaml b/helm/scalable-mb/scalable-mb/templates/message-broker-deployment.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/message-broker-deployment.yaml rename to helm/scalable-mb/scalable-mb/templates/message-broker-deployment.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/message-broker-ingress.yaml b/helm/scalable-mb/scalable-mb/templates/message-broker-ingress.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/message-broker-ingress.yaml rename to helm/scalable-mb/scalable-mb/templates/message-broker-ingress.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/message-broker-service.yaml b/helm/scalable-mb/scalable-mb/templates/message-broker-service.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/message-broker-service.yaml rename to helm/scalable-mb/scalable-mb/templates/message-broker-service.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/message-broker-volume-claim.yaml b/helm/scalable-mb/scalable-mb/templates/message-broker-volume-claim.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/message-broker-volume-claim.yaml rename to helm/scalable-mb/scalable-mb/templates/message-broker-volume-claim.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/persistent-volumes.yaml b/helm/scalable-mb/scalable-mb/templates/persistent-volumes.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/persistent-volumes.yaml rename to helm/scalable-mb/scalable-mb/templates/persistent-volumes.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/rbac.yaml b/helm/scalable-mb/scalable-mb/templates/rbac.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/rbac.yaml rename to helm/scalable-mb/scalable-mb/templates/rbac.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/secrets.yaml b/helm/scalable-mb/scalable-mb/templates/secrets.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/secrets.yaml rename to helm/scalable-mb/scalable-mb/templates/secrets.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/templates/svcaccount.yaml b/helm/scalable-mb/scalable-mb/templates/svcaccount.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/templates/svcaccount.yaml rename to helm/scalable-mb/scalable-mb/templates/svcaccount.yaml diff --git a/helm/scalable-mb/scalable-mb-conf/values.yaml b/helm/scalable-mb/scalable-mb/values.yaml similarity index 100% rename from helm/scalable-mb/scalable-mb-conf/values.yaml rename to helm/scalable-mb/scalable-mb/values.yaml From 6e40355d5b7410459077e0b0746f18f067af080f Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 18:13:58 +0530 Subject: [PATCH 07/37] Add NOTES.txt template to scalable-mb chart --- helm/scalable-mb/scalable-mb-conf/templates/NOTES.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 helm/scalable-mb/scalable-mb-conf/templates/NOTES.txt diff --git a/helm/scalable-mb/scalable-mb-conf/templates/NOTES.txt b/helm/scalable-mb/scalable-mb-conf/templates/NOTES.txt deleted file mode 100644 index e69de29b..00000000 From 06d5939d2c81cd3f3d8eecde4000c82f0173cfd7 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 19:07:46 +0530 Subject: [PATCH 08/37] Change README.md of 'scalable-mb' pattern --- helm/scalable-mb/README.md | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/helm/scalable-mb/README.md b/helm/scalable-mb/README.md index d7c2f101..3ba4a9f9 100644 --- a/helm/scalable-mb/README.md +++ b/helm/scalable-mb/README.md @@ -29,10 +29,10 @@ git clone https://github.com/wso2/kubernetes-ei.git ##### 2. Provide configurations: -1. The default product configurations are available at `/scalable-mb-conf/confs` folder. Change the +1. The default product configurations are available at `/scalable-mb/confs` folder. Change the configurations as necessary. -2. Open the `/scalable-mb-conf/values.yaml` and provide the following values. +2. Open the `/scalable-mb/values.yaml` and provide the following values. `username`: Username of your Free Trial Subscription
`password`: Password of your Free Trial Subscription
@@ -41,19 +41,8 @@ configurations as necessary. `svcaccount`: Service Account
`serverIp`: NFS Server IP
`locationPath`: NFS location path - -3. Open the `/scalable-mb-deployment/values.yaml` and provide the following values. - `namespace`: Namespace
- `svcaccount`: Service Account - -##### 3. Deploy the configurations: - -``` -helm install --name /scalable-mb-conf -``` - -##### 4. Deploy MySql: +##### 3. Deploy MySql: If there is an external product database(s), add those configurations as stated at `step 2.1`. Otherwise, run the below command to create the product database. ``` @@ -61,13 +50,14 @@ helm install --name wso2ei-scalable-mb-rdbms-service -f /mysql/values ``` `NAMESPACE` should be same as `step 2.2`. -##### 5. Deploy Message Broker profile: +##### 4. Deploy Message Broker profile: ``` -helm install --name /scalable-mb-deployment +helm install --name /scalable-mb --namespace ``` +`NAMESPACE` should be same as `step 2.2`. -##### 6. Access Management Console: +##### 5. Access Management Console: Default deployment will expose `wso2ei-scalable-message-broker` host (to expose Administrative services and Management Console). From 473d2368d382bcf93ceb8adeda9196987e84bb13 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 20:25:57 +0530 Subject: [PATCH 09/37] Reduce to one command in integrator-with-analytics helm pattern --- .../integrator-analytics-1-deployment.yaml | 0 .../integrator-analytics-1-service.yaml | 0 .../integrator-analytics-2-deployment.yaml | 0 .../integrator-analytics-2-service.yaml | 0 .../integrator-analytics-ingress.yaml | 0 .../integrator-analytics-service.yaml | 0 .../integrator-analytics-volume-claims.yaml | 0 .../templates/integrator-deployment.yaml | 0 .../templates/integrator-gateway-ingress.yaml | 0 .../templates/integrator-gateway-service.yaml | 0 .../templates/integrator-ingress.yaml | 0 .../templates/integrator-service.yaml | 0 .../templates/integrator-volume-claims.yaml | 0 .../templates/namespace.yaml | 19 ----------- .../.helmignore | 21 ------------ .../Chart.yaml | 19 ----------- .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 32 ------------------- .../values.yaml | 2 -- 19 files changed, 93 deletions(-) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-analytics-1-deployment.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-analytics-1-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-analytics-2-deployment.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-analytics-2-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-analytics-ingress.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-analytics-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-analytics-volume-claims.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-deployment.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-gateway-ingress.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-gateway-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-ingress.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-deployment => integrator-with-analytics-conf}/templates/integrator-volume-claims.yaml (100%) delete mode 100644 helm/integrator-with-analytics/integrator-with-analytics-conf/templates/namespace.yaml delete mode 100644 helm/integrator-with-analytics/integrator-with-analytics-deployment/.helmignore delete mode 100644 helm/integrator-with-analytics/integrator-with-analytics-deployment/Chart.yaml delete mode 100644 helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/NOTES.txt delete mode 100644 helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/_helpers.tpl delete mode 100644 helm/integrator-with-analytics/integrator-with-analytics-deployment/values.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-1-deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-1-deployment.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-1-deployment.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-1-deployment.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-1-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-1-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-1-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-1-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-2-deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-2-deployment.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-2-deployment.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-2-deployment.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-2-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-2-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-2-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-2-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-ingress.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-ingress.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-ingress.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-ingress.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-volume-claims.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-volume-claims.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-analytics-volume-claims.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-volume-claims.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-deployment.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-deployment.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-deployment.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-gateway-ingress.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-gateway-ingress.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-gateway-ingress.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-gateway-ingress.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-gateway-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-gateway-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-gateway-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-gateway-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-ingress.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-ingress.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-ingress.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-ingress.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-volume-claims.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-volume-claims.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/integrator-volume-claims.yaml rename to helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-volume-claims.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/namespace.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/namespace.yaml deleted file mode 100644 index c2811ffc..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/namespace.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Namespace -metadata: - name: {{ .Values.namespace }} - namespace: "" diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/.helmignore b/helm/integrator-with-analytics/integrator-with-analytics-deployment/.helmignore deleted file mode 100644 index f0c13194..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics-deployment/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/Chart.yaml b/helm/integrator-with-analytics/integrator-with-analytics-deployment/Chart.yaml deleted file mode 100644 index 74986fc0..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics-deployment/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the deployment of WSO2 EI Integrator-Analytics profile -name: integrator-analytics-deployment -version: 1.0.0 diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/NOTES.txt b/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/NOTES.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/_helpers.tpl b/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/_helpers.tpl deleted file mode 100644 index 32adfe7d..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics-deployment/templates/_helpers.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "integrator-analytics-deployment.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "integrator-analytics-deployment.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "integrator-analytics-deployment.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/helm/integrator-with-analytics/integrator-with-analytics-deployment/values.yaml b/helm/integrator-with-analytics/integrator-with-analytics-deployment/values.yaml deleted file mode 100644 index d3d1e917..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics-deployment/values.yaml +++ /dev/null @@ -1,2 +0,0 @@ -namespace: "wso2" -svcaccount: "wso2svc-account" From bd1d339461d994a64be9c78fa0930a46fc2fade3 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 20:28:39 +0530 Subject: [PATCH 10/37] Change chart name to 'integrator-with-analytics' --- .../integrator-with-analytics-conf/values.yaml | 14 -------------- .../.helmignore | 0 .../Chart.yaml | 8 ++++---- .../auth.json | 0 .../ei-analytics-1/conf/analytics/my-node-id.dat | 0 .../conf/analytics/spark/spark-defaults.conf | 0 .../confs/ei-analytics-1/conf/axis2/axis2.xml | 0 .../confs/ei-analytics-1/conf/carbon.xml | 0 .../conf/datasources/analytics-datasources.xml | 0 .../conf/datasources/master-datasources.xml | 0 .../confs/ei-analytics-1/conf/event-processor.xml | 0 .../confs/ei-analytics-1/conf/registry.xml | 0 .../confs/ei-analytics-1/conf/user-mgt.xml | 0 .../jaggeryapps/portal/configs/designer.json | 0 .../ei-analytics-2/conf/analytics/my-node-id.dat | 0 .../conf/analytics/spark/spark-defaults.conf | 0 .../confs/ei-analytics-2/conf/axis2/axis2.xml | 0 .../confs/ei-analytics-2/conf/carbon.xml | 0 .../conf/datasources/analytics-datasources.xml | 0 .../conf/datasources/master-datasources.xml | 0 .../confs/ei-analytics-2/conf/event-processor.xml | 0 .../confs/ei-analytics-2/conf/registry.xml | 0 .../confs/ei-analytics-2/conf/user-mgt.xml | 0 .../jaggeryapps/portal/configs/designer.json | 0 .../confs/integrator/conf/axis2/axis2.xml | 0 .../confs/integrator/conf/carbon.xml | 0 .../conf/datasources/master-datasources.xml | 0 .../confs/integrator/conf/registry.xml | 0 .../confs/integrator/conf/synapse.properties | 0 .../confs/integrator/conf/user-mgt.xml | 0 .../MessageFlowConfigurationPublisher.xml | 0 .../MessageFlowStatisticsPublisher.xml | 0 .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/ei-analytics-1-conf-analytics.yaml | 0 .../templates/ei-analytics-1-conf-axis2.yaml | 0 .../templates/ei-analytics-1-conf-datasources.yaml | 0 .../ei-analytics-1-conf-spark-analytics.yaml | 0 .../templates/ei-analytics-1-conf.yaml | 0 .../ei-analytics-1-deployment-portal.yaml | 0 .../templates/ei-analytics-2-conf-analytics.yaml | 0 .../templates/ei-analytics-2-conf-axis2.yaml | 0 .../templates/ei-analytics-2-conf-datasources.yaml | 0 .../ei-analytics-2-conf-spark-analytics.yaml | 0 .../templates/ei-analytics-2-conf.yaml | 0 .../ei-analytics-2-deployment-portal.yaml | 0 .../integrator-analytics-1-deployment.yaml | 0 .../templates/integrator-analytics-1-service.yaml | 0 .../integrator-analytics-2-deployment.yaml | 0 .../templates/integrator-analytics-2-service.yaml | 0 .../templates/integrator-analytics-ingress.yaml | 0 .../templates/integrator-analytics-service.yaml | 0 .../integrator-analytics-volume-claims.yaml | 0 .../templates/integrator-conf-axis2.yaml | 0 .../templates/integrator-conf-datasources.yaml | 0 .../integrator-conf-event-publishers.yaml | 0 .../templates/integrator-conf.yaml | 0 .../templates/integrator-deployment.yaml | 0 .../templates/integrator-gateway-ingress.yaml | 0 .../templates/integrator-gateway-service.yaml | 0 .../templates/integrator-ingress.yaml | 0 .../templates/integrator-service.yaml | 0 .../templates/integrator-volume-claims.yaml | 0 .../templates/persistent-volumes.yaml | 0 .../templates/rbac.yaml | 0 .../templates/secrets.yaml | 0 .../templates/svcaccount.yaml | 0 67 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 helm/integrator-with-analytics/integrator-with-analytics-conf/values.yaml rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/.helmignore (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/Chart.yaml (87%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/auth.json (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/analytics/my-node-id.dat (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/axis2/axis2.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/carbon.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/datasources/master-datasources.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/event-processor.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/registry.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/conf/user-mgt.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/analytics/my-node-id.dat (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/axis2/axis2.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/carbon.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/datasources/master-datasources.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/event-processor.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/registry.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/conf/user-mgt.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/integrator/conf/axis2/axis2.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/integrator/conf/carbon.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/integrator/conf/datasources/master-datasources.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/integrator/conf/registry.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/integrator/conf/synapse.properties (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/integrator/conf/user-mgt.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/NOTES.txt (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/_helpers.tpl (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-1-conf-analytics.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-1-conf-axis2.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-1-conf-datasources.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-1-conf-spark-analytics.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-1-conf.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-1-deployment-portal.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-2-conf-analytics.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-2-conf-axis2.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-2-conf-datasources.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-2-conf-spark-analytics.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-2-conf.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/ei-analytics-2-deployment-portal.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-analytics-1-deployment.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-analytics-1-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-analytics-2-deployment.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-analytics-2-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-analytics-ingress.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-analytics-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-analytics-volume-claims.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-conf-axis2.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-conf-datasources.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-conf-event-publishers.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-conf.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-deployment.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-gateway-ingress.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-gateway-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-ingress.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-service.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/integrator-volume-claims.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/persistent-volumes.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/rbac.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/secrets.yaml (100%) rename helm/integrator-with-analytics/{integrator-with-analytics-conf => integrator-with-analytics}/templates/svcaccount.yaml (100%) diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/values.yaml b/helm/integrator-with-analytics/integrator-with-analytics-conf/values.yaml deleted file mode 100644 index fd9d0b72..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics-conf/values.yaml +++ /dev/null @@ -1,14 +0,0 @@ -username: "" -password: "" -email: "" - -namespace: "wso2" -svcaccount: "wso2svc-account" -serverIp: "" -sharedDeploymentLocationPath: "" -sharedTenantsLocationPath: "" -analytics1DataLocationPath: "" -analytics2DataLocationPath: "" -brokerSharedDeploymentLocationPath: "" -analytics1LocationPath: "" -analytics2LocationPath: "" diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/.helmignore b/helm/integrator-with-analytics/integrator-with-analytics/.helmignore similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/.helmignore rename to helm/integrator-with-analytics/integrator-with-analytics/.helmignore diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/Chart.yaml b/helm/integrator-with-analytics/integrator-with-analytics/Chart.yaml similarity index 87% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/Chart.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/Chart.yaml index ff9efe3d..65cdb91f 100644 --- a/helm/integrator-with-analytics/integrator-with-analytics-conf/Chart.yaml +++ b/helm/integrator-with-analytics/integrator-with-analytics/Chart.yaml @@ -13,7 +13,7 @@ # limitations under the License. apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the deployment of WSO2 EI Integrator-Analytics profile configurations -name: integrator-analytics-conf -version: 1.0.0 +appVersion: "6.3.0-2" +description: A Helm chart for the deployment of WSO2 EI Integrator-Analytics profile +name: integrator-analytics +version: 6.3.0-2 diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/auth.json b/helm/integrator-with-analytics/integrator-with-analytics/auth.json similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/auth.json rename to helm/integrator-with-analytics/integrator-with-analytics/auth.json diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/analytics/my-node-id.dat b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/analytics/my-node-id.dat similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/analytics/my-node-id.dat rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/analytics/my-node-id.dat diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/axis2/axis2.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/axis2/axis2.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/axis2/axis2.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/axis2/axis2.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/carbon.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/carbon.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/carbon.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/carbon.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/datasources/master-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/datasources/master-datasources.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/event-processor.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/event-processor.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/event-processor.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/event-processor.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/registry.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/registry.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/registry.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/registry.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/user-mgt.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/conf/user-mgt.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/analytics/my-node-id.dat b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/analytics/my-node-id.dat rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/axis2/axis2.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/axis2/axis2.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/carbon.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/carbon.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/carbon.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/carbon.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/datasources/master-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/datasources/master-datasources.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/event-processor.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/event-processor.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/event-processor.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/event-processor.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/registry.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/registry.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/registry.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/registry.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/user-mgt.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/conf/user-mgt.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json rename to helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/axis2/axis2.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/axis2/axis2.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/axis2/axis2.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/axis2/axis2.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/carbon.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/carbon.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/carbon.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/carbon.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/datasources/master-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/datasources/master-datasources.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/datasources/master-datasources.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/datasources/master-datasources.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/registry.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/registry.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/registry.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/registry.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/synapse.properties b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/synapse.properties similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/synapse.properties rename to helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/synapse.properties diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/user-mgt.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/user-mgt.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/conf/user-mgt.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/user-mgt.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml rename to helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/NOTES.txt b/helm/integrator-with-analytics/integrator-with-analytics/templates/NOTES.txt similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/NOTES.txt rename to helm/integrator-with-analytics/integrator-with-analytics/templates/NOTES.txt diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/_helpers.tpl b/helm/integrator-with-analytics/integrator-with-analytics/templates/_helpers.tpl similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/_helpers.tpl rename to helm/integrator-with-analytics/integrator-with-analytics/templates/_helpers.tpl diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf-analytics.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf-analytics.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf-analytics.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf-analytics.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf-axis2.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf-axis2.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf-axis2.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf-axis2.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf-datasources.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf-datasources.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf-datasources.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf-datasources.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf-spark-analytics.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf-spark-analytics.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf-spark-analytics.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf-spark-analytics.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-conf.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-conf.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-deployment-portal.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-deployment-portal.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-1-deployment-portal.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-1-deployment-portal.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf-analytics.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf-analytics.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf-analytics.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf-analytics.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf-axis2.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf-axis2.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf-axis2.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf-axis2.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf-datasources.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf-datasources.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf-datasources.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf-datasources.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf-spark-analytics.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf-spark-analytics.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf-spark-analytics.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf-spark-analytics.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-conf.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-conf.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-deployment-portal.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-deployment-portal.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/ei-analytics-2-deployment-portal.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/ei-analytics-2-deployment-portal.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-1-deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-1-deployment.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-1-deployment.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-1-deployment.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-1-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-1-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-1-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-1-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-2-deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-2-deployment.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-2-deployment.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-2-deployment.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-2-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-2-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-2-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-2-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-ingress.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-ingress.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-ingress.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-ingress.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-volume-claims.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-volume-claims.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-analytics-volume-claims.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-analytics-volume-claims.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-conf-axis2.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-conf-axis2.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-conf-axis2.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-conf-axis2.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-conf-datasources.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-conf-datasources.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-conf-datasources.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-conf-datasources.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-conf-event-publishers.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-conf-event-publishers.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-conf-event-publishers.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-conf-event-publishers.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-conf.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-conf.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-conf.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-conf.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-deployment.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-deployment.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-deployment.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-gateway-ingress.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-gateway-ingress.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-gateway-ingress.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-gateway-ingress.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-gateway-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-gateway-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-gateway-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-gateway-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-ingress.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-ingress.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-ingress.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-ingress.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-service.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-service.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-service.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-service.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-volume-claims.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-volume-claims.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/integrator-volume-claims.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/integrator-volume-claims.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/persistent-volumes.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/persistent-volumes.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/persistent-volumes.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/persistent-volumes.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/rbac.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/rbac.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/rbac.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/rbac.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/secrets.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/secrets.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/secrets.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/secrets.yaml diff --git a/helm/integrator-with-analytics/integrator-with-analytics-conf/templates/svcaccount.yaml b/helm/integrator-with-analytics/integrator-with-analytics/templates/svcaccount.yaml similarity index 100% rename from helm/integrator-with-analytics/integrator-with-analytics-conf/templates/svcaccount.yaml rename to helm/integrator-with-analytics/integrator-with-analytics/templates/svcaccount.yaml From 1851bb1b85d0bd74d7be6bd67d3bf2ba54cb5218 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 20:29:48 +0530 Subject: [PATCH 11/37] Add NOTES.txt template to 'integrator-with-analytics' pattern --- .../integrator-with-analytics/templates/NOTES.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/helm/integrator-with-analytics/integrator-with-analytics/templates/NOTES.txt b/helm/integrator-with-analytics/integrator-with-analytics/templates/NOTES.txt index e69de29b..0150b7bf 100644 --- a/helm/integrator-with-analytics/integrator-with-analytics/templates/NOTES.txt +++ b/helm/integrator-with-analytics/integrator-with-analytics/templates/NOTES.txt @@ -0,0 +1,5 @@ +Thank you for installing WSO2 Enterprise Integrator. + +Your release is named {{ .Release.Name }}. + +Please refer the official documentation at https://docs.wso2.com/display/EI630 From 70bc67d5902459daebadd72ac525a3ff68b3e5d2 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 21:55:06 +0530 Subject: [PATCH 12/37] Change README.md of 'integrator-with-analytics' pattern Add removed values.yaml file --- helm/integrator-with-analytics/README.md | 32 +++++++------------ .../integrator-with-analytics/values.yaml | 13 ++++++++ 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 helm/integrator-with-analytics/integrator-with-analytics/values.yaml diff --git a/helm/integrator-with-analytics/README.md b/helm/integrator-with-analytics/README.md index aa906ac9..79927236 100644 --- a/helm/integrator-with-analytics/README.md +++ b/helm/integrator-with-analytics/README.md @@ -37,10 +37,11 @@ git clone https://github.com/wso2/kubernetes-ei.git ##### 2. Setup a Network File System (NFS) to be used for persistent storage. Create and export unique directories within the NFS server instance for each of the following Kubernetes Persistent Volume -resources defined in the `/integrator-with-analytics-conf/values.yaml` file: +resources defined in the `/integrator-with-analytics/values.yaml` file: * `sharedDeploymentLocationPath` * `sharedTenantsLocationPath` +* `brokerSharedDeploymentLocationPath` * `analytics1DataLocationPath` * `analytics2DataLocationPath` * `analytics1LocationPath` @@ -60,10 +61,10 @@ Grant read-write-execute permissions to the `wso2carbon` user, for each of the p ##### 3. Provide configurations. -a. The default product configurations are available at `/integrator-with-analytics-conf/confs` folder. Change the +a. The default product configurations are available at `/integrator-with-analytics/confs` folder. Change the configurations as necessary. -b. Open the `/integrator-with-analytics-conf/values.yaml` and provide the following values. +b. Open the `/integrator-with-analytics/values.yaml` and provide the following values. | Parameter | Description | |---------------------------------|-------------------------------------------------------------------------------------------| @@ -73,27 +74,16 @@ b. Open the `/integrator-with-analytics-conf/values.yaml` and provide | `namespace` | Kubernetes Namespace in which the resources are deployed | | `svcaccount` | Kubernetes Service Account in the `namespace` to which product instance pods are attached | | `serverIp` | NFS Server IP | -| `sharedDeploymentLocationPath` | NFS shared deployment directory(`/repository/deployment`) location for EI | +| `sharedDeploymentLocationPath` | NFS shared deployment directory(`/repository/ei-deployment`) location for EI | | `sharedTenantsLocationPath` | NFS shared tenants directory(`/repository/tenants`) location for EI | +| `brokerSharedDeploymentLocationPath` | NFS shared deployment directory (`/wso2/broker/repository/deployment/`) location for Broker | | `analytics1DataLocationPath` | NFS volume for Indexed data for Analytics node 1(`/repository/data`) | | `analytics2DataLocationPath` | NFS volume for Indexed data for Analytics node 2(`/repository/data`) | | `analytics1LocationPath` | NFS volume for Analytics data for Analytics node 1(`/repository/analytics`) | | `analytics2LocationPath` | NFS volume for Analytics data for Analytics node 2(`/repository/analytics`) | -c. Open the `/integrator-with-analytics-deployment/values.yaml` and provide the following values. - -| Parameter | Description | -|---------------------------------|-------------------------------------------------------------------------------------------| -| `namespace` | Kubernetes Namespace in which the resources are deployed | -| `svcaccount` | Kubernetes Service Account in the `namespace` to which product instance pods are attached | - -##### 4. Deploy the configurations. -``` -helm install --name /integrator-with-analytics-conf -``` - -##### 5. Deploy product database(s) using MySQL in Kubernetes. +##### 4. Deploy product database(s) using MySQL in Kubernetes. ``` helm install --name wso2ei-integrator-with-analytics-rdbms-service -f /mysql/values.yaml stable/mysql --namespace @@ -103,13 +93,15 @@ helm install --name wso2ei-integrator-with-analytics-rdbms-service -f /integrator-with-analytics-deployment +helm install --name /integrator-with-analytics --namespace ``` -##### 7. Access Management Console. +`NAMESPACE` should be same as in `step 3.b`. + +##### 6. Access Management Console. Default deployment will expose `wso2ei-integrator`, `wso2ei-integrator-gateway` and `wso2ei-analytics` hosts. diff --git a/helm/integrator-with-analytics/integrator-with-analytics/values.yaml b/helm/integrator-with-analytics/integrator-with-analytics/values.yaml new file mode 100644 index 00000000..07275794 --- /dev/null +++ b/helm/integrator-with-analytics/integrator-with-analytics/values.yaml @@ -0,0 +1,13 @@ +username: "" +password: "" +email: "" +namespace: "wso2" +svcaccount: "wso2svc-account" +serverIp: "" +sharedDeploymentLocationPath: "" +sharedTenantsLocationPath: "" +analytics1DataLocationPath: "" +analytics2DataLocationPath: "" +brokerSharedDeploymentLocationPath: "" +analytics1LocationPath: "" +analytics2LocationPath: "" From 567a96497d4ea48517a4e48a86ab941098e209c7 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 22:16:04 +0530 Subject: [PATCH 13/37] Reduce to one command in integrator-broker-with-analytics pattern --- .../integrator-analytics-1-deployment.yaml | 0 .../integrator-analytics-1-service.yaml | 0 .../integrator-analytics-2-deployment.yaml | 0 .../integrator-analytics-2-service.yaml | 0 .../integrator-analytics-ingress.yaml | 0 .../integrator-analytics-service.yaml | 0 .../integrator-analytics-volume-claims.yaml | 0 .../templates/integrator-deployment.yaml | 0 .../templates/integrator-gateway-ingress.yaml | 0 .../templates/integrator-gateway-service.yaml | 0 .../templates/integrator-ingress.yaml | 0 .../templates/integrator-service.yaml | 0 .../templates/integrator-volume-claims.yaml | 0 .../templates/message-broker-deployment.yaml | 0 .../templates/message-broker-ingress.yaml | 0 .../templates/message-broker-service.yaml | 0 .../message-broker-volume-claim.yaml | 0 .../templates/namespace.yaml | 19 ----------- .../.helmignore | 21 ------------ .../Chart.yaml | 19 ----------- .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 32 ------------------- .../values.yaml | 2 -- 23 files changed, 93 deletions(-) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-analytics-1-deployment.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-analytics-1-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-analytics-2-deployment.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-analytics-2-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-analytics-ingress.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-analytics-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-analytics-volume-claims.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-deployment.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-gateway-ingress.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-gateway-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-ingress.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/integrator-volume-claims.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/message-broker-deployment.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/message-broker-ingress.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/message-broker-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-deployment => integrator-broker-with-analytics-conf}/templates/message-broker-volume-claim.yaml (100%) delete mode 100644 helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/namespace.yaml delete mode 100644 helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/.helmignore delete mode 100644 helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/Chart.yaml delete mode 100644 helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/NOTES.txt delete mode 100644 helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/_helpers.tpl delete mode 100644 helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/values.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-1-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-1-deployment.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-1-deployment.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-1-deployment.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-1-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-1-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-1-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-1-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-2-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-2-deployment.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-2-deployment.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-2-deployment.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-2-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-2-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-2-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-2-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-ingress.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-ingress.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-ingress.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-ingress.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-volume-claims.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-volume-claims.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-analytics-volume-claims.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-volume-claims.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-deployment.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-deployment.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-deployment.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-gateway-ingress.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-gateway-ingress.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-gateway-ingress.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-gateway-ingress.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-gateway-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-gateway-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-gateway-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-gateway-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-ingress.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-ingress.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-ingress.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-ingress.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-volume-claims.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-volume-claims.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/integrator-volume-claims.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-volume-claims.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/message-broker-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-deployment.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/message-broker-deployment.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-deployment.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/message-broker-ingress.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-ingress.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/message-broker-ingress.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-ingress.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/message-broker-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/message-broker-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/message-broker-volume-claim.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-volume-claim.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/message-broker-volume-claim.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-volume-claim.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/namespace.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/namespace.yaml deleted file mode 100644 index c2811ffc..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/namespace.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Namespace -metadata: - name: {{ .Values.namespace }} - namespace: "" diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/.helmignore b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/.helmignore deleted file mode 100644 index f0c13194..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/Chart.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/Chart.yaml deleted file mode 100644 index 4b433e0c..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the deployment of WSO2 Integrator Broker Analytics deployment -name: integrator-broker-analytics-deployment -version: 1.0.0 diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/NOTES.txt b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/NOTES.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/_helpers.tpl b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/_helpers.tpl deleted file mode 100644 index 3af707b9..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/templates/_helpers.tpl +++ /dev/null @@ -1,32 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "integrator-broker-analytics-deployment.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "integrator-broker-analytics-deployment.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "integrator-broker-analytics-deployment.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/values.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/values.yaml deleted file mode 100644 index d3d1e917..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-deployment/values.yaml +++ /dev/null @@ -1,2 +0,0 @@ -namespace: "wso2" -svcaccount: "wso2svc-account" From 8f42ca0d25a8cd48fe419ea4fb06d57671eaf2ea Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 22:18:04 +0530 Subject: [PATCH 14/37] Change chart name to 'integrator-broker-with-analytics' --- .../.helmignore | 0 .../Chart.yaml | 8 ++++---- .../auth.json | 0 .../confs/broker/axis2/axis2.xml | 0 .../confs/broker/broker.xml | 0 .../confs/broker/carbon.xml | 0 .../confs/broker/datasources/master-datasources.xml | 0 .../confs/broker/hazelcast.properties | 0 .../confs/broker/log4j.properties | 0 .../confs/broker/registry.xml | 0 .../confs/broker/user-mgt.xml | 0 .../confs/ei-analytics-1/conf/analytics/my-node-id.dat | 0 .../conf/analytics/spark/spark-defaults.conf | 0 .../confs/ei-analytics-1/conf/axis2/axis2.xml | 0 .../confs/ei-analytics-1/conf/carbon.xml | 0 .../conf/datasources/analytics-datasources.xml | 0 .../conf/datasources/master-datasources.xml | 0 .../confs/ei-analytics-1/conf/event-processor.xml | 0 .../confs/ei-analytics-1/conf/registry.xml | 0 .../confs/ei-analytics-1/conf/user-mgt.xml | 0 .../server/jaggeryapps/portal/configs/designer.json | 0 .../confs/ei-analytics-2/conf/analytics/my-node-id.dat | 0 .../conf/analytics/spark/spark-defaults.conf | 0 .../confs/ei-analytics-2/conf/axis2/axis2.xml | 0 .../confs/ei-analytics-2/conf/carbon.xml | 0 .../conf/datasources/analytics-datasources.xml | 0 .../conf/datasources/master-datasources.xml | 0 .../confs/ei-analytics-2/conf/event-processor.xml | 0 .../confs/ei-analytics-2/conf/registry.xml | 0 .../confs/ei-analytics-2/conf/user-mgt.xml | 0 .../server/jaggeryapps/portal/configs/designer.json | 0 .../confs/integrator/conf/axis2/axis2.xml | 0 .../confs/integrator/conf/carbon.xml | 0 .../integrator/conf/datasources/master-datasources.xml | 0 .../confs/integrator/conf/jndi.properties | 0 .../confs/integrator/conf/registry.xml | 0 .../confs/integrator/conf/synapse.properties | 0 .../confs/integrator/conf/user-mgt.xml | 0 .../eventpublishers/MessageFlowConfigurationPublisher.xml | 0 .../eventpublishers/MessageFlowStatisticsPublisher.xml | 0 .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/ei-analytics-1-conf-analytics.yaml | 0 .../templates/ei-analytics-1-conf-axis2.yaml | 0 .../templates/ei-analytics-1-conf-datasources.yaml | 0 .../templates/ei-analytics-1-conf-spark-analytics.yaml | 0 .../templates/ei-analytics-1-conf.yaml | 0 .../templates/ei-analytics-1-deployment-portal.yaml | 0 .../templates/ei-analytics-2-conf-analytics.yaml | 0 .../templates/ei-analytics-2-conf-axis2.yaml | 0 .../templates/ei-analytics-2-conf-datasources.yaml | 0 .../templates/ei-analytics-2-conf-spark-analytics.yaml | 0 .../templates/ei-analytics-2-conf.yaml | 0 .../templates/ei-analytics-2-deployment-portal.yaml | 0 .../templates/integrator-analytics-1-deployment.yaml | 0 .../templates/integrator-analytics-1-service.yaml | 0 .../templates/integrator-analytics-2-deployment.yaml | 0 .../templates/integrator-analytics-2-service.yaml | 0 .../templates/integrator-analytics-ingress.yaml | 0 .../templates/integrator-analytics-service.yaml | 0 .../templates/integrator-analytics-volume-claims.yaml | 0 .../templates/integrator-conf-axis2.yaml | 0 .../templates/integrator-conf-datasources.yaml | 0 .../templates/integrator-conf-event-publishers.yaml | 0 .../templates/integrator-conf.yaml | 0 .../templates/integrator-deployment.yaml | 0 .../templates/integrator-gateway-ingress.yaml | 0 .../templates/integrator-gateway-service.yaml | 0 .../templates/integrator-ingress.yaml | 0 .../templates/integrator-service.yaml | 0 .../templates/integrator-volume-claims.yaml | 0 .../templates/mb-conf-axis2.yaml | 0 .../templates/mb-conf-datasources.yaml | 0 .../templates/mb-conf.yaml | 0 .../templates/message-broker-deployment.yaml | 0 .../templates/message-broker-ingress.yaml | 0 .../templates/message-broker-service.yaml | 0 .../templates/message-broker-volume-claim.yaml | 0 .../templates/persistent-volumes.yaml | 0 .../templates/rbac.yaml | 0 .../templates/secrets.yaml | 0 .../templates/svcaccount.yaml | 0 .../values.yaml | 0 83 files changed, 4 insertions(+), 4 deletions(-) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/.helmignore (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/Chart.yaml (86%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/auth.json (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/broker/axis2/axis2.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/broker/broker.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/broker/carbon.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/broker/datasources/master-datasources.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/broker/hazelcast.properties (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/broker/log4j.properties (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/broker/registry.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/broker/user-mgt.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/analytics/my-node-id.dat (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/axis2/axis2.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/carbon.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/datasources/master-datasources.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/event-processor.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/registry.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/conf/user-mgt.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/analytics/my-node-id.dat (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/axis2/axis2.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/carbon.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/datasources/master-datasources.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/event-processor.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/registry.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/conf/user-mgt.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/conf/axis2/axis2.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/conf/carbon.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/conf/datasources/master-datasources.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/conf/jndi.properties (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/conf/registry.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/conf/synapse.properties (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/conf/user-mgt.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/NOTES.txt (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/_helpers.tpl (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-1-conf-analytics.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-1-conf-axis2.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-1-conf-datasources.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-1-conf-spark-analytics.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-1-conf.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-1-deployment-portal.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-2-conf-analytics.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-2-conf-axis2.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-2-conf-datasources.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-2-conf-spark-analytics.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-2-conf.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/ei-analytics-2-deployment-portal.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-analytics-1-deployment.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-analytics-1-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-analytics-2-deployment.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-analytics-2-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-analytics-ingress.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-analytics-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-analytics-volume-claims.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-conf-axis2.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-conf-datasources.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-conf-event-publishers.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-conf.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-deployment.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-gateway-ingress.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-gateway-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-ingress.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/integrator-volume-claims.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/mb-conf-axis2.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/mb-conf-datasources.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/mb-conf.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/message-broker-deployment.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/message-broker-ingress.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/message-broker-service.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/message-broker-volume-claim.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/persistent-volumes.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/rbac.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/secrets.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/templates/svcaccount.yaml (100%) rename helm/integrator-broker-with-analytics/{integrator-broker-with-analytics-conf => integrator-broker-with-analytics}/values.yaml (100%) diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/.helmignore b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/.helmignore similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/.helmignore rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/.helmignore diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/Chart.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/Chart.yaml similarity index 86% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/Chart.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/Chart.yaml index ca7e0e5b..0c945971 100644 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/Chart.yaml +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/Chart.yaml @@ -13,7 +13,7 @@ # limitations under the License. apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for the deployment of WSO2 EI Integrator Broker Analytics configurations -name: integrator-broker-analytics-conf -version: 1.0.0 +appVersion: "6.3.0-2" +description: A Helm chart for the deployment of WSO2 EI Integrator Broker Analytics +name: integrator-broker-analytics +version: 6.3.0-2 diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/auth.json b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/auth.json similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/auth.json rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/auth.json diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/axis2/axis2.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/axis2/axis2.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/axis2/axis2.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/axis2/axis2.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/broker.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/broker.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/broker.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/broker.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/carbon.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/carbon.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/carbon.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/carbon.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/datasources/master-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/datasources/master-datasources.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/datasources/master-datasources.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/datasources/master-datasources.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/hazelcast.properties b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/hazelcast.properties similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/hazelcast.properties rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/hazelcast.properties diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/log4j.properties b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/log4j.properties similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/log4j.properties rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/log4j.properties diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/registry.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/registry.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/registry.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/registry.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/user-mgt.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/user-mgt.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/broker/user-mgt.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/user-mgt.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/analytics/my-node-id.dat b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/analytics/my-node-id.dat similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/analytics/my-node-id.dat rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/analytics/my-node-id.dat diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/axis2/axis2.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/axis2/axis2.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/axis2/axis2.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/axis2/axis2.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/carbon.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/carbon.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/carbon.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/carbon.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/datasources/master-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/datasources/master-datasources.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/event-processor.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/event-processor.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/event-processor.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/event-processor.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/registry.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/registry.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/registry.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/registry.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/user-mgt.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/conf/user-mgt.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/analytics/my-node-id.dat b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/analytics/my-node-id.dat rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/axis2/axis2.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/axis2/axis2.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/carbon.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/carbon.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/carbon.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/carbon.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/datasources/master-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/datasources/master-datasources.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/event-processor.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/event-processor.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/event-processor.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/event-processor.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/registry.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/registry.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/registry.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/registry.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/user-mgt.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/conf/user-mgt.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/axis2/axis2.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/axis2/axis2.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/axis2/axis2.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/axis2/axis2.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/carbon.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/carbon.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/carbon.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/carbon.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/datasources/master-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/datasources/master-datasources.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/datasources/master-datasources.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/datasources/master-datasources.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/jndi.properties b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/jndi.properties similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/jndi.properties rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/jndi.properties diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/registry.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/registry.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/registry.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/registry.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/synapse.properties b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/synapse.properties similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/synapse.properties rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/synapse.properties diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/user-mgt.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/user-mgt.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/conf/user-mgt.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/user-mgt.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowConfigurationPublisher.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/repository/deployment/server/eventpublishers/MessageFlowStatisticsPublisher.xml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/NOTES.txt b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/NOTES.txt similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/NOTES.txt rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/NOTES.txt diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/_helpers.tpl b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/_helpers.tpl similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/_helpers.tpl rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/_helpers.tpl diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf-analytics.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf-analytics.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf-analytics.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf-analytics.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf-axis2.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf-axis2.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf-axis2.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf-axis2.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf-datasources.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf-datasources.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf-datasources.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf-datasources.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf-spark-analytics.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf-spark-analytics.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf-spark-analytics.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf-spark-analytics.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-conf.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-conf.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-deployment-portal.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-deployment-portal.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-1-deployment-portal.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-1-deployment-portal.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf-analytics.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf-analytics.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf-analytics.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf-analytics.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf-axis2.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf-axis2.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf-axis2.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf-axis2.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf-datasources.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf-datasources.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf-datasources.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf-datasources.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf-spark-analytics.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf-spark-analytics.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf-spark-analytics.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf-spark-analytics.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-conf.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-conf.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-deployment-portal.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-deployment-portal.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/ei-analytics-2-deployment-portal.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/ei-analytics-2-deployment-portal.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-1-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-1-deployment.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-1-deployment.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-1-deployment.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-1-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-1-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-1-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-1-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-2-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-2-deployment.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-2-deployment.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-2-deployment.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-2-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-2-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-2-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-2-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-ingress.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-ingress.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-ingress.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-ingress.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-volume-claims.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-volume-claims.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-analytics-volume-claims.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-analytics-volume-claims.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-conf-axis2.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-conf-axis2.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-conf-axis2.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-conf-axis2.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-conf-datasources.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-conf-datasources.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-conf-datasources.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-conf-datasources.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-conf-event-publishers.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-conf-event-publishers.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-conf-event-publishers.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-conf-event-publishers.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-conf.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-conf.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-conf.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-conf.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-deployment.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-deployment.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-deployment.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-gateway-ingress.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-gateway-ingress.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-gateway-ingress.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-gateway-ingress.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-gateway-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-gateway-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-gateway-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-gateway-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-ingress.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-ingress.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-ingress.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-ingress.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-volume-claims.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-volume-claims.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/integrator-volume-claims.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/integrator-volume-claims.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/mb-conf-axis2.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/mb-conf-axis2.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/mb-conf-axis2.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/mb-conf-axis2.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/mb-conf-datasources.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/mb-conf-datasources.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/mb-conf-datasources.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/mb-conf-datasources.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/mb-conf.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/mb-conf.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/mb-conf.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/mb-conf.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-deployment.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-deployment.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-deployment.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-ingress.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-ingress.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-ingress.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-ingress.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-service.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-service.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-service.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-service.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-volume-claim.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-volume-claim.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/message-broker-volume-claim.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-volume-claim.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/persistent-volumes.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/persistent-volumes.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/persistent-volumes.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/persistent-volumes.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/rbac.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/rbac.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/rbac.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/rbac.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/secrets.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/secrets.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/secrets.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/secrets.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/svcaccount.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/svcaccount.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/templates/svcaccount.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/svcaccount.yaml diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/values.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/values.yaml similarity index 100% rename from helm/integrator-broker-with-analytics/integrator-broker-with-analytics-conf/values.yaml rename to helm/integrator-broker-with-analytics/integrator-broker-with-analytics/values.yaml From a554ea89c9ee527da3c5f108a6301a506655f767 Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 22:19:01 +0530 Subject: [PATCH 15/37] Add NOTES.txt template to pattern integrator-broker-with-analytics --- .../integrator-broker-with-analytics/templates/NOTES.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/NOTES.txt b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/NOTES.txt index e69de29b..0150b7bf 100644 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/NOTES.txt +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/NOTES.txt @@ -0,0 +1,5 @@ +Thank you for installing WSO2 Enterprise Integrator. + +Your release is named {{ .Release.Name }}. + +Please refer the official documentation at https://docs.wso2.com/display/EI630 From ead115f6fdcdb6ad50e970ee83ecfd38cee93afe Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Thu, 16 Aug 2018 22:55:07 +0530 Subject: [PATCH 16/37] Fix deployment order of integrator-broker-with-analytics pattern --- .../templates/message-broker-deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-deployment.yaml index 29dcfe86..7ebe6938 100644 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-deployment.yaml +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/templates/message-broker-deployment.yaml @@ -15,7 +15,7 @@ apiVersion: apps/v1beta1 kind: Deployment metadata: - name: wso2ei-mb-deployment + name: wso2ei-broker-deployment namespace : {{ .Values.namespace }} spec: replicas: 2 @@ -39,7 +39,7 @@ spec: - /bin/bash - -c - nc -z localhost 9446 - initialDelaySeconds: 90 + initialDelaySeconds: 250 periodSeconds: 10 readinessProbe: exec: @@ -47,7 +47,7 @@ spec: - /bin/bash - -c - nc -z localhost 9446 - initialDelaySeconds: 90 + initialDelaySeconds: 250 periodSeconds: 10 imagePullPolicy: Always ports: From e07925bf7a05b18bcbf196795f8ada6329b55efc Mon Sep 17 00:00:00 2001 From: kasunsiyambalapitiya Date: Fri, 17 Aug 2018 14:22:56 +0530 Subject: [PATCH 17/37] Change README.md of 'integrator-broker-with-analytics' pattern --- .../README.md | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/helm/integrator-broker-with-analytics/README.md b/helm/integrator-broker-with-analytics/README.md index c8d02b5b..2237960f 100644 --- a/helm/integrator-broker-with-analytics/README.md +++ b/helm/integrator-broker-with-analytics/README.md @@ -36,7 +36,7 @@ git clone https://github.com/wso2/kubernetes-ei.git ##### 2. Setup a Network File System (NFS) to be used for persistent storage. Create and export unique directories within the NFS server instance for each of the following Kubernetes Persistent Volume -resources defined in the `/integrator-broker-with-analytics-conf/values.yaml` file: +resources defined in the `/integrator-broker-with-analytics/values.yaml` file: * `sharedDeploymentLocationPath` * `sharedTenantsLocationPath` @@ -59,10 +59,10 @@ Grant read-write-execute permissions to the `wso2carbon` user, for each of the p ##### 3. Provide configurations. -a. The default product configurations are available at `/integrator-broker-with-analytics-conf/confs` folder. Change the +a. The default product configurations are available at `/integrator-broker-with-analytics/confs` folder. Change the configurations as necessary. -b. Open the `/integrator-broker-with-analytics-conf/values.yaml` and provide the following values. +b. Open the `/integrator-broker-with-analytics/values.yaml` and provide the following values. | Parameter | Description | |---------------------------------|-------------------------------------------------------------------------------------------| @@ -74,25 +74,14 @@ b. Open the `/integrator-broker-with-analytics-conf/values.yaml` and | `serverIp` | NFS Server IP | | `sharedDeploymentLocationPath` | NFS shared deployment directory(`/repository/deployment`) location for EI | | `sharedTenantsLocationPath` | NFS shared tenants directory(`/repository/tenants`) location for EI | +| `brokerSharedDeploymentLocationPath` | NFS shared deployment directory (`/wso2/broker/repository/deployment/`) location for Broker | | `analytics1DataLocationPath` | NFS volume for Indexed data for Analytics node 1(`/repository/data`) | | `analytics2DataLocationPath` | NFS volume for Indexed data for Analytics node 2(`/repository/data`) | | `analytics1LocationPath` | NFS volume for Analytics data for Analytics node 1(`/repository/analytics`) | | `analytics2LocationPath` | NFS volume for Analytics data for Analytics node 2(`/repository/analytics`) | -c. Open the `/integrator-broker-with-analytics-deployment/values.yaml` and provide the following values. - -| Parameter | Description | -|---------------------------------|-------------------------------------------------------------------------------------------| -| `namespace` | Kubernetes Namespace in which the resources are deployed | -| `svcaccount` | Kubernetes Service Account in the `namespace` to which product instance pods are attached | - -##### 4. Deploy the configurations. -``` -helm install --name /integrator-broker-with-analytics-conf -``` - -##### 5. Deploy product database(s) using MySQL in Kubernetes. +##### 4. Deploy product database(s) using MySQL in Kubernetes. ``` helm install --name wso2ei-integrator-broker-with-analytics-rdbms-service -f /mysql/values.yaml stable/mysql --namespace @@ -102,13 +91,15 @@ helm install --name wso2ei-integrator-broker-with-analytics-rdbms-service -f /integrator-broker-with-analytics-deployment +helm install --name /integrator-broker-with-analytics --namespace ``` -##### 7. Access product management consoles. +`NAMESPACE` should be same as in `step 3.b`. + +##### 6. Access product management consoles. Default deployment will expose `wso2ei-integrator`, `wso2ei-broker`, `wso2ei-integrator-gateway` and `wso2ei-analytics` hosts. From 4ac1294e78c0c4a61544bf81e590c016c28cab7c Mon Sep 17 00:00:00 2001 From: ThilinaManamgoda Date: Sat, 22 Sep 2018 19:39:59 +0530 Subject: [PATCH 18/37] Init ei-analytics --- .../integrator-analytics-1-deployment.yaml | 150 ++-- .../integrator-analytics-1-service.yaml | 67 +- .../integrator-analytics-2-deployment.yaml | 152 ++-- .../integrator-analytics-2-service.yaml | 67 +- .../integrator-analytics-service.yaml | 22 +- .../integrator-analytics-volume-claims.yaml | 83 -- .../conf/analytics/my-node-id.dat | 1 - .../conf/analytics/spark/spark-defaults.conf | 122 --- .../confs/ei-analytics-1/conf/axis2/axis2.xml | 719 ------------------ .../confs/ei-analytics-1/conf/carbon.xml | 695 ----------------- .../datasources/analytics-datasources.xml | 112 --- .../conf/datasources/master-datasources.xml | 108 --- .../ei-analytics-1/conf/event-processor.xml | 156 ---- .../confs/ei-analytics-1/conf/registry.xml | 149 ---- .../confs/ei-analytics-1/conf/user-mgt.xml | 260 ------- .../conf/worker/deployment.yaml | 650 ++++++++++++++++ .../jaggeryapps/portal/configs/designer.json | 95 --- .../conf/analytics/my-node-id.dat | 1 - .../conf/analytics/spark/spark-defaults.conf | 122 --- .../confs/ei-analytics-2/conf/axis2/axis2.xml | 719 ------------------ .../confs/ei-analytics-2/conf/carbon.xml | 695 ----------------- .../datasources/analytics-datasources.xml | 112 --- .../conf/datasources/master-datasources.xml | 108 --- .../ei-analytics-2/conf/event-processor.xml | 156 ---- .../confs/ei-analytics-2/conf/registry.xml | 149 ---- .../confs/ei-analytics-2/conf/user-mgt.xml | 260 ------- .../conf/worker/deployment.yaml | 650 ++++++++++++++++ .../jaggeryapps/portal/configs/designer.json | 95 --- .../confs/integrator/conf/axis2/axis2.xml | 4 +- .../confs/integrator/conf/carbon.xml | 47 +- .../conf/datasources/master-datasources.xml | 4 +- .../MessageFlowConfigurationPublisher.xml | 3 +- .../MessageFlowStatisticsPublisher.xml | 2 +- .../extras/confs/mysql/dbscripts/init.sql | 195 ++++- .../rdbms/volumes/persistent-volumes.yaml | 4 +- .../integrator-analytics-ingress.yaml | 40 - .../integrator/integrator-deployment.yaml | 12 +- integrator-analytics/scripts/deploy.sh | 20 +- integrator-analytics/scripts/undeploy.sh | 1 - .../volumes/persistent-volumes.yaml | 83 +- 40 files changed, 1686 insertions(+), 5404 deletions(-) delete mode 100644 integrator-analytics/analytics/integrator-analytics-volume-claims.yaml delete mode 100644 integrator-analytics/confs/ei-analytics-1/conf/analytics/my-node-id.dat delete mode 100755 integrator-analytics/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf delete mode 100644 integrator-analytics/confs/ei-analytics-1/conf/axis2/axis2.xml delete mode 100644 integrator-analytics/confs/ei-analytics-1/conf/carbon.xml delete mode 100644 integrator-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml delete mode 100644 integrator-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml delete mode 100644 integrator-analytics/confs/ei-analytics-1/conf/event-processor.xml delete mode 100644 integrator-analytics/confs/ei-analytics-1/conf/registry.xml delete mode 100644 integrator-analytics/confs/ei-analytics-1/conf/user-mgt.xml create mode 100644 integrator-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml delete mode 100644 integrator-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json delete mode 100644 integrator-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat delete mode 100755 integrator-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf delete mode 100644 integrator-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml delete mode 100644 integrator-analytics/confs/ei-analytics-2/conf/carbon.xml delete mode 100644 integrator-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml delete mode 100644 integrator-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml delete mode 100644 integrator-analytics/confs/ei-analytics-2/conf/event-processor.xml delete mode 100644 integrator-analytics/confs/ei-analytics-2/conf/registry.xml delete mode 100644 integrator-analytics/confs/ei-analytics-2/conf/user-mgt.xml create mode 100644 integrator-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml delete mode 100644 integrator-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json delete mode 100644 integrator-analytics/ingresses/integrator-analytics-ingress.yaml diff --git a/integrator-analytics/analytics/integrator-analytics-1-deployment.yaml b/integrator-analytics/analytics/integrator-analytics-1-deployment.yaml index 99b4f601..116098e3 100644 --- a/integrator-analytics/analytics/integrator-analytics-1-deployment.yaml +++ b/integrator-analytics/analytics/integrator-analytics-1-deployment.yaml @@ -32,7 +32,13 @@ spec: spec: containers: - name: integrator-with-analytics-ei-analytics-1 - image: docker.wso2.com/wso2ei-analytics:6.3.0 + image: gcr.io/research-n-development-209206/wso2ei-analytics:6.4.0 + env: + - + name: NODE_IP + valueFrom: + fieldRef: + fieldPath: status.podIP resources: limits: memory: "4Gi" @@ -41,120 +47,64 @@ spec: livenessProbe: exec: command: - - /bin/bash + - /bin/sh - -c - - nc -z localhost 7712 + - nc -z localhost 9091 initialDelaySeconds: 250 periodSeconds: 10 readinessProbe: exec: command: - - /bin/bash + - /bin/sh - -c - nc -z localhost 7712 initialDelaySeconds: 250 periodSeconds: 10 + lifecycle: + preStop: + exec: + command: ['sh', '-c', '${WSO2_SERVER_HOME}/bin/analytics-worker.sh stop'] imagePullPolicy: Always + securityContext: + runAsUser: 802 ports: - - - containerPort: 9764 - protocol: "TCP" - - - containerPort: 9444 - protocol: "TCP" - - - containerPort: 7612 - protocol: "TCP" - - - containerPort: 7712 - protocol: "TCP" - - - containerPort: 11225 - protocol: "TCP" - - - containerPort: 10006 - protocol: "TCP" - - - containerPort: 11001 - protocol: "TCP" - - - containerPort: 11002 - protocol: "TCP" - - - containerPort: 11003 - protocol: "TCP" - - - containerPort: 11501 - protocol: "TCP" - - - containerPort: 8083 - protocol: "TCP" - - - containerPort: 4041 - protocol: "TCP" - - - containerPort: 10007 - protocol: TCP - - - containerPort: 12501 - protocol: TCP - - - containerPort: 13001 - protocol: TCP - - - containerPort: 13501 - protocol: TCP - - - containerPort: 14501 - protocol: TCP - - - containerPort: 7078 - protocol: TCP - - - containerPort: 6067 - protocol: TCP + - + containerPort: 9444 + protocol: TCP + - + containerPort: 9091 + protocol: TCP + - + containerPort: 9543 + protocol: TCP + - + containerPort: 9711 + protocol: TCP + - + containerPort: 9611 + protocol: TCP + - + containerPort: 7712 + protocol: TCP + - + containerPort: 7612 + protocol: TCP + - + containerPort: 7070 + protocol: TCP + - + containerPort: 7443 + protocol: TCP + - + containerPort: 9894 + protocol: TCP volumeMounts: - - name: ei-analytics-1-conf - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf - - name: ei-analytics-1-conf-analytics - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-analytics - - name: ei-analytics-1-conf-spark-analytics - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-spark-analytics - - name: ei-analytics-1-conf-axis2 - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-axis2 - - name: ei-analytics-1-conf-datasources - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-datasources - - name: ei-analytics-1-deployment-portal - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-portal - - name: analytics-persistent-disk - mountPath: /home/wso2carbon/wso2ei-6.3.0/wso2/analytics/conf/analytics - - name: data-persistent-disk - mountPath: /home/wso2carbon/wso2ei-6.3.0/wso2/analytics/repository/data + - name: ei-analytics-1-conf-worker + mountPath: /home/wso2carbon/wso2-config-volume/wso2/analytics/conf/worker serviceAccountName: "wso2svc-account" imagePullSecrets: - name: wso2creds volumes: - - name: ei-analytics-1-conf - configMap: - name: ei-analytics-1-conf - - name: ei-analytics-1-conf-analytics - configMap: - name: ei-analytics-1-conf-analytics - - name: ei-analytics-1-conf-spark-analytics - configMap: - name: ei-analytics-1-conf-spark-analytics - - name: ei-analytics-1-conf-axis2 - configMap: - name: ei-analytics-1-conf-axis2 - - name: ei-analytics-1-conf-datasources - configMap: - name: ei-analytics-1-conf-datasources - - name: ei-analytics-1-deployment-portal + - name: ei-analytics-1-conf-worker configMap: - name: ei-analytics-1-deployment-portal - - name: analytics-persistent-disk - persistentVolumeClaim: - claimName: ei-analytics-1-analytics-volume-claim - - name: data-persistent-disk - persistentVolumeClaim: - claimName: ei-analytics-1-data-volume-claim + name: ei-analytics-1-conf-worker diff --git a/integrator-analytics/analytics/integrator-analytics-1-service.yaml b/integrator-analytics/analytics/integrator-analytics-1-service.yaml index ea1f7c7e..43547d71 100644 --- a/integrator-analytics/analytics/integrator-analytics-1-service.yaml +++ b/integrator-analytics/analytics/integrator-analytics-1-service.yaml @@ -22,85 +22,38 @@ spec: ports: - name: 'thrift' - port: 7612 + port: 9444 protocol: TCP - name: 'thrift-ssl' - port: 7712 + port: 9091 protocol: TCP - name: 'spark-port-1' - port: 11225 + port: 9543 protocol: TCP - name: 'spark-port-2' - port: 10006 + port: 9711 protocol: TCP - name: 'spark-port-3' - port: 11001 + port: 9611 protocol: TCP - name: 'spark-port-4' protocol: TCP - port: 8082 + port: 7712 - name: 'spark-port-5' protocol: TCP - port: 4041 + port: 7612 - name: 'spark-port-6' protocol: TCP - port: 12001 + port: 7070 - name: 'spark-port-7' protocol: TCP - port: 12002 - - - name: 'spark-port-8' - protocol: TCP - port: 12003 - - - name: 'spark-port-9' - protocol: TCP - port: 12004 - - - name: 'spark-port-10' - protocol: TCP - port: 12005 - - - name: 'analytics-port-1' - protocol: TCP - port: 10007 - - - name: 'analytics-port-2' - protocol: TCP - port: 11002 - - - name: 'analytics-port-3' - protocol: TCP - port: 12501 - - - name: 'analytics-port-4' - protocol: TCP - port: 13001 - - - name: 'analytics-port-5' - protocol: TCP - port: 13501 - - - name: 'analytics-port-6' - protocol: TCP - port: 14501 - - - name: 'analytics-port-7' - protocol: TCP - port: 7078 - - - name: 'analytics-port-8' - protocol: TCP - port: 6067 - - - name: 'analytics-port-9' - protocol: TCP - port: 11003 + port: 7443 + diff --git a/integrator-analytics/analytics/integrator-analytics-2-deployment.yaml b/integrator-analytics/analytics/integrator-analytics-2-deployment.yaml index 24ac943c..ff0db722 100644 --- a/integrator-analytics/analytics/integrator-analytics-2-deployment.yaml +++ b/integrator-analytics/analytics/integrator-analytics-2-deployment.yaml @@ -31,8 +31,14 @@ spec: node: integrator-with-analytics-ei-analytics-2 spec: containers: - - name: integrator-with-analytics-ei-analytics-2 - image: docker.wso2.com/wso2ei-analytics:6.3.0 + - name: integrator-with-analytics-ei-analytics-1 + image: gcr.io/research-n-development-209206/wso2ei-analytics:6.4.0 + env: + - + name: NODE_IP + valueFrom: + fieldRef: + fieldPath: status.podIP resources: limits: memory: "4Gi" @@ -41,120 +47,64 @@ spec: livenessProbe: exec: command: - - /bin/bash + - /bin/sh - -c - - nc -z localhost 7712 + - nc -z localhost 9091 initialDelaySeconds: 250 periodSeconds: 10 readinessProbe: exec: command: - - /bin/bash + - /bin/sh - -c - nc -z localhost 7712 initialDelaySeconds: 250 periodSeconds: 10 + lifecycle: + preStop: + exec: + command: ['sh', '-c', '${WSO2_SERVER_HOME}/bin/analytics-worker.sh stop'] imagePullPolicy: Always + securityContext: + runAsUser: 802 ports: - - - containerPort: 9764 - protocol: "TCP" - - - containerPort: 9444 - protocol: "TCP" - - - containerPort: 7612 - protocol: "TCP" - - - containerPort: 7712 - protocol: "TCP" - - - containerPort: 11225 - protocol: "TCP" - - - containerPort: 10006 - protocol: "TCP" - - - containerPort: 11001 - protocol: "TCP" - - - containerPort: 11002 - protocol: "TCP" - - - containerPort: 11003 - protocol: "TCP" - - - containerPort: 11501 - protocol: "TCP" - - - containerPort: 8083 - protocol: "TCP" - - - containerPort: 4041 - protocol: "TCP" - - - containerPort: 10007 - protocol: TCP - - - containerPort: 12501 - protocol: TCP - - - containerPort: 13001 - protocol: TCP - - - containerPort: 13501 - protocol: TCP - - - containerPort: 14501 - protocol: TCP - - - containerPort: 7078 - protocol: TCP - - - containerPort: 6067 - protocol: TCP + - + containerPort: 9444 + protocol: TCP + - + containerPort: 9091 + protocol: TCP + - + containerPort: 9543 + protocol: TCP + - + containerPort: 9711 + protocol: TCP + - + containerPort: 9611 + protocol: TCP + - + containerPort: 7712 + protocol: TCP + - + containerPort: 7612 + protocol: TCP + - + containerPort: 7070 + protocol: TCP + - + containerPort: 7443 + protocol: TCP + - + containerPort: 9894 + protocol: TCP volumeMounts: - - name: ei-analytics-2-conf - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf - - name: ei-analytics-2-conf-analytics - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-analytics - - name: ei-analytics-2-conf-spark-analytics - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-spark-analytics - - name: ei-analytics-2-conf-axis2 - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-axis2 - - name: ei-analytics-2-conf-datasources - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-datasources - - name: ei-analytics-2-deployment-portal - mountPath: /home/wso2carbon/kubernetes-volumes/analytics/conf-portal - - name: analytics-persistent-disk - mountPath: /home/wso2carbon/wso2ei-6.3.0/wso2/analytics/conf/analytics - - name: data-persistent-disk - mountPath: /home/wso2carbon/wso2ei-6.3.0/wso2/analytics/repository/data + - name: ei-analytics-2-conf-worker + mountPath: /home/wso2carbon/wso2-config-volume/wso2/analytics/conf/worker serviceAccountName: "wso2svc-account" imagePullSecrets: - name: wso2creds volumes: - - name: ei-analytics-2-conf - configMap: - name: ei-analytics-2-conf - - name: ei-analytics-2-conf-analytics - configMap: - name: ei-analytics-2-conf-analytics - - name: ei-analytics-2-conf-spark-analytics - configMap: - name: ei-analytics-2-conf-spark-analytics - - name: ei-analytics-2-conf-axis2 - configMap: - name: ei-analytics-2-conf-axis2 - - name: ei-analytics-2-conf-datasources - configMap: - name: ei-analytics-2-conf-datasources - - name: ei-analytics-2-deployment-portal + - name: ei-analytics-2-conf-worker configMap: - name: ei-analytics-2-deployment-portal - - name: analytics-persistent-disk - persistentVolumeClaim: - claimName: ei-analytics-2-analytics-volume-claim - - name: data-persistent-disk - persistentVolumeClaim: - claimName: ei-analytics-2-data-volume-claim + name: ei-analytics-2-conf-worker diff --git a/integrator-analytics/analytics/integrator-analytics-2-service.yaml b/integrator-analytics/analytics/integrator-analytics-2-service.yaml index 71efdbc0..b199caa2 100644 --- a/integrator-analytics/analytics/integrator-analytics-2-service.yaml +++ b/integrator-analytics/analytics/integrator-analytics-2-service.yaml @@ -22,85 +22,38 @@ spec: ports: - name: 'thrift' - port: 7612 + port: 9444 protocol: TCP - name: 'thrift-ssl' - port: 7712 + port: 9091 protocol: TCP - name: 'spark-port-1' - port: 11225 + port: 9543 protocol: TCP - name: 'spark-port-2' - port: 10006 + port: 9711 protocol: TCP - name: 'spark-port-3' - port: 11001 + port: 9611 protocol: TCP - name: 'spark-port-4' protocol: TCP - port: 8082 + port: 7712 - name: 'spark-port-5' protocol: TCP - port: 4041 + port: 7612 - name: 'spark-port-6' protocol: TCP - port: 12001 + port: 7070 - name: 'spark-port-7' protocol: TCP - port: 12002 - - - name: 'spark-port-8' - protocol: TCP - port: 12003 - - - name: 'spark-port-9' - protocol: TCP - port: 12004 - - - name: 'spark-port-10' - protocol: TCP - port: 12005 - - - name: 'analytics-port-1' - protocol: TCP - port: 10007 - - - name: 'analytics-port-2' - protocol: TCP - port: 11002 - - - name: 'analytics-port-3' - protocol: TCP - port: 12501 - - - name: 'analytics-port-4' - protocol: TCP - port: 13001 - - - name: 'analytics-port-5' - protocol: TCP - port: 13501 - - - name: 'analytics-port-6' - protocol: TCP - port: 14501 - - - name: 'analytics-port-7' - protocol: TCP - port: 7078 - - - name: 'analytics-port-8' - protocol: TCP - port: 6067 - - - name: 'analytics-port-9' - protocol: TCP - port: 11003 + port: 7443 + diff --git a/integrator-analytics/analytics/integrator-analytics-service.yaml b/integrator-analytics/analytics/integrator-analytics-service.yaml index 9a07f4e7..13bc4c5d 100644 --- a/integrator-analytics/analytics/integrator-analytics-service.yaml +++ b/integrator-analytics/analytics/integrator-analytics-service.yaml @@ -20,23 +20,19 @@ spec: selector: deployment: integrator-with-analytics-ei-analytics ports: - - name: servlet-http - port: 9764 - targetPort: 9764 + - name: event-receiver-1 + port: 7612 + targetPort: 7612 protocol: TCP - name: servlet-https - port: 9444 - targetPort: 9444 + port: 9091 + targetPort: 9091 protocol: TCP - - name: spark-ui - port: 4041 - targetPort: 4041 - protocol: TCP - - name: spark-master-webui - port: 8082 + - name: siddhi-1 + port: 7070 targetPort: 8082 protocol: TCP - - name: spark-worker-webui - port: 11501 + - name: siddhi-2 + port: 7443 targetPort: 11501 protocol: TCP diff --git a/integrator-analytics/analytics/integrator-analytics-volume-claims.yaml b/integrator-analytics/analytics/integrator-analytics-volume-claims.yaml deleted file mode 100644 index fc6148b6..00000000 --- a/integrator-analytics/analytics/integrator-analytics-volume-claims.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: ei-analytics-1-data-volume-claim -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi - storageClassName: "" - selector: - matchLabels: - purpose: analytics-data - node: wso2ei-analytics-1 - ---- - -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: ei-analytics-2-data-volume-claim -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi - storageClassName: "" - selector: - matchLabels: - purpose: analytics-data - node: wso2ei-analytics-2 - ---- - -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: ei-analytics-1-analytics-volume-claim -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi - storageClassName: "" - selector: - matchLabels: - purpose: analytics - node: wso2ei-analytics-1 - ---- - -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: ei-analytics-2-analytics-volume-claim -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi - storageClassName: "" - selector: - matchLabels: - purpose: analytics - node: wso2ei-analytics-2 diff --git a/integrator-analytics/confs/ei-analytics-1/conf/analytics/my-node-id.dat b/integrator-analytics/confs/ei-analytics-1/conf/analytics/my-node-id.dat deleted file mode 100644 index a947e205..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/analytics/my-node-id.dat +++ /dev/null @@ -1 +0,0 @@ -wso2ei-analytics-1 diff --git a/integrator-analytics/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf b/integrator-analytics/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf deleted file mode 100755 index 92fbc882..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/analytics/spark/spark-defaults.conf +++ /dev/null @@ -1,122 +0,0 @@ -# ------------------------------------------------------ -# CARBON RELATED SPARK PROPERTIES -# ------------------------------------------------------ -# Carbon specific properties when running Spark in the Carbon environment. -# Should start with the prefix "carbon." - -# carbon.spark.master config has 3 states -# 1. (default) local mode - spark starts in the local mode (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master local" or "carbon.spark.master local[2]" -# 2. client mode - DAS acts as a client for an external Spark cluster (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master spark://:" -# 3. cluster mode - DAS creates its own Spark cluster usign Carbon Clustering -# ex: "carbon.spark.master local" AND "carbon.spark.master.count " - -carbon.spark.master local -carbon.spark.master.count 2 - -#This configuration is used to limit the number of results returned from spark query execution -#To return all the results, set this to -1 -carbon.spark.results.limit 1000 - -# Below configuratoin can be used to point to a symbolic link to WSO2 DAS HOME -# carbon.das.symbolic.link /home/ubuntu/das/das_symlink/ - -# Below configuration can be used with the spark fair scheduler, when fair schedule pools are used. the -# defualt pool name for carbon is 'carbon-pool' -# carbon.scheduler.pool carbon-pool - - - -# ------------------------------------------------------ -# SPARK PROPERTIES -# ------------------------------------------------------ -# Default system properties included when running spark. -# This is useful for setting default environmental settings. -# Check http://spark.apache.org/docs/latest/configuration.html for further information - -# Application (Spark Driver) Properties -# ------------------------------------------------------ -spark.app.name CarbonAnalytics -# Spark Driver will be running inside the carbon JVM. Hence the below properties are obsolete -# spark.driver.cores 1 -# spark.driver.memory 512m - -# Runtime Environment -# ------------------------------------------------------ - -# Spark UI -spark.ui.port 4040 -spark.history.ui.port 18080 - -# Compression and Serialization -spark.serializer org.apache.spark.serializer.KryoSerializer -spark.kryoserializer.buffer 256k -spark.kryoserializer.buffer.max 256m - -# Execution Behavior - -# Networking -spark.blockManager.port 12000 -spark.broadcast.port 12500 -spark.driver.port 13000 -spark.executor.port 13500 -spark.fileserver.port 14000 -spark.replClassServer.port 14500 -spark.akka.timeout 1000s - -# Scheduling -spark.scheduler.mode FAIR -# this property can be set to specify where hte fairscheduler.xml file is. the carbon specific -# fairscheduler.xml is in the /repository/conf/analytics/spark directory -# spark.scheduler.allocation.file /repository/conf/analytics/spark/fairscheduler.xml - -# Dynamic Allocation - -# Security - -# Encryption - -# Standalone Cluster Configs -spark.deploy.recoveryMode CUSTOM -spark.deploy.recoveryMode.factory org.wso2.carbon.analytics.spark.core.deploy.AnalyticsRecoveryModeFactory - -# Master -spark.master.port 7077 -spark.master.rest.port 6066 -spark.master.webui.port 8081 - -# Worker -spark.worker.cores 1 -spark.worker.memory 1g -spark.worker.dir work -spark.worker.port 11000 -spark.worker.webui.port 11500 - -# Executors -# spark.executor.cores 1 ; Default: Takes all the available cores in the worker -spark.executor.memory 1g -spark.executor.logs.rolling.strategy size -spark.executor.logs.rolling.maxSize 10000000 -spark.executor.logs.rolling.maxRetainedFiles 10 - -# spark.cores.max ; Default: Int.MAX_VALUE; The maximum amount of CPU cores to request for the application from across -# the cluster (not from each machine) - - -# Spark Logging -# ------------------------------------------------------ -# To allow event logging for spark you need to uncomment -# the line spark.eventlog.log true and set the directory in which the -# logs will be stored. - -# spark.eventLog.enabled true -# spark.eventLog.dir - -# YARN related configs -# ------------------------------------------------------ -# spark.yarn.jar - - diff --git a/integrator-analytics/confs/ei-analytics-1/conf/axis2/axis2.xml b/integrator-analytics/confs/ei-analytics-1/conf/axis2/axis2.xml deleted file mode 100644 index 566abce7..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/axis2/axis2.xml +++ /dev/null @@ -1,719 +0,0 @@ - - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Enterprise Integrator-6.3.0 - - - WSO2 Enterprise Integrator-6.3.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - kubernetes - - - - - wso2.ei.analytics.domain - - - - - - 45564 - - 100 - - 60 - - - - - - ei-analytics-1 - - - - - - 4000 - - - - - - - - - - - org.wso2.carbon.membership.scheme.kubernetes.KubernetesMembershipScheme - wso2 - integrator-with-analytics-ei-analytics-1-service,integrator-with-analytics-ei-analytics-2-service - true - false - - - - - - - - - - diff --git a/integrator-analytics/confs/ei-analytics-1/conf/carbon.xml b/integrator-analytics/confs/ei-analytics-1/conf/carbon.xml deleted file mode 100644 index 0a155002..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/carbon.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - WSO2 Enterprise Integrator Analytics - - - EI - - - 6.0.0 - - - wso2ei-analytics - - - wso2ei-analytics - - - local:/${carbon.context}/services/ - - - - - - - DataAnalyticsServer - ComplexEventProcessor - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 1 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 153722867280912 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - true - allow - - - - - - - - - - - false - - (.*)(/images|/css|/js|/docs)(.*) - - - - - - - true - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://product-dist.wso2.com/p2/carbon/releases/wilkes/ - - - - - - - - true - - - - - - true - - diff --git a/integrator-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml b/integrator-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml deleted file mode 100644 index 6c2097d4..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - - - WSO2_ANALYTICS_EVENT_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_ANALYTICS_EVENT_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - - - - - - - - - diff --git a/integrator-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml b/integrator-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml deleted file mode 100644 index af23d572..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - WSO2_CARBON_DB - The datasource used for registry and user manager - - jdbc/WSO2CarbonDB - - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_CONFIG_DB - The datasource used for config registry - - jdbc/WSO2ConfigDB - - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2EI_INTEGRATOR_CONFIG_GOV_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 80 - 60000 - true - SELECT 1 - 30000 - - - - - WSO2_USER_DB - The datasource is used for user mangement and userstore - - jdbc/WSO2UserDB - - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2EI_USER_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - - - - - - - - diff --git a/integrator-analytics/confs/ei-analytics-1/conf/event-processor.xml b/integrator-analytics/confs/ei-analytics-1/conf/event-processor.xml deleted file mode 100644 index 1d13b213..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/event-processor.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - 10000 - - integrator-with-analytics-ei-analytics - 11224 - 20000 - 20000 - - 5242880 - - UTF-8 - 1024 - 30000 - - 1000000 - - 10 - - 1000000 - - 10 - - - integrator-with-analytics-ei-analytics - 10005 - 15000 - 10000 - - - integrator-with-analytics-ei-analytics - 11000 - - 5242880 - - UTF-8 - 1024 - 30000 - - - 15 - 10 - - cep_persistence - - - - - - - - - - - 0.0.0.0 - 8904 - - - 0.0.0.0 - 11000 - - - - - - - localhost - 8904 - - - localhost - 8905 - - - - 20000 - - 5000 - - 10000 - - - - - - 15000 - 15100 - - - 20000 - - 8192 - - 8192 - - 5242880 - - UTF-8 - - 10000 - - 20000 - - - - 1024 - - 5242880 - - UTF-8 - - 20000 - - - - 60000 - 60000 - - - org.wso2.cep.storm.dependencies.jar - - - - 20000 - - - - - diff --git a/integrator-analytics/confs/ei-analytics-1/conf/registry.xml b/integrator-analytics/confs/ei-analytics-1/conf/registry.xml deleted file mode 100644 index 61068d93..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/registry.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - jdbc/WSO2ConfigDB - - - wso2config - wso2config - false - / - - - wso2config - /_system/config/ei_analytics - - - wso2config - /_system/governance/ei_analytics - - - - - - - - - - - - - 35 - 3 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/integrator-analytics/confs/ei-analytics-1/conf/user-mgt.xml b/integrator-analytics/confs/ei-analytics-1/conf/user-mgt.xml deleted file mode 100644 index 801f8cac..00000000 --- a/integrator-analytics/confs/ei-analytics-1/conf/user-mgt.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - true - jdbc/WSO2UserDB - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - true - true - ^[\S]{3,30}$ - ^[\S]{3,30}$ - Username pattern policy violated - ^[\S]{5,30}$ - ^[\S]{5,30}$ - Password length should be within 5 to 30 characters - ^[\S]{3,30}$ - ^[\S]{3,30}$ - true - false - true - SHA-256 - true - , - 100 - 100 - true - false - - - - - - - - - - - - - /permission - true - false - - - - - diff --git a/integrator-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml b/integrator-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml new file mode 100644 index 00000000..da56ca5b --- /dev/null +++ b/integrator-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml @@ -0,0 +1,650 @@ +################################################################################ +# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: ${NODE_IP} + # server name + name: WSO2 EI integrator Analytics + # dashboard type + # ports used by this server + ports: + # port offset + offset: 0 + type: wso2-ei-analytics + +wso2.transport.http: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 9091 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 9444 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + senderConfigurations: + - + id: "http-sender" + +siddhi.stores.query.api: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 7070 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 7443 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7612' + sslPort: '7712' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: ${NODE_IP} + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + +# This is the main configuration for metrics +wso2.metrics: + # Enable Metrics + enabled: true + reporting: + console: + - # The name for the Console Reporter + name: Console + + # Enable Console Reporter + enabled: false + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and printing in the console + pollingPeriod: 5 + +wso2.metrics.jdbc: + # Data Source Configurations for JDBC Reporters + dataSource: + # Default Data Source Configuration + - &JDBC01 + # JNDI name of the data source to be used by the JDBC Reporter. + # This data source should be defined in a *-datasources.xml file in conf/datasources directory. + dataSourceName: java:comp/env/jdbc/WSO2MetricsDB + # Schedule regular deletion of metrics data older than a set number of days. + # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. + # Deleting data older than seven days should be sufficient. + scheduledCleanup: + # Enable scheduled cleanup to delete Metrics data in the database. + enabled: true + + # The scheduled job will cleanup all data older than the specified days + daysToKeep: 7 + + # This is the period for each cleanup operation in seconds. + scheduledCleanupPeriod: 86400 + + # The JDBC Reporter is in the Metrics JDBC Core feature + reporting: + # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime + jdbc: + - # The name for the JDBC Reporter + name: JDBC + + # Enable JDBC Reporter + enabled: true + + # Source of Metrics, which will be used to identify each metric in database --> + # Commented to use the hostname by default + # source: Carbon + + # Alias referring to the Data Source configuration + dataSource: *JDBC01 + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and updating the database with the values + pollingPeriod: 60 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # Periodic Persistence Configuration +state.persistence: + enabled: true + intervalInMin: 1 + revisionsToKeep: 3 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.DBPersistenceStore + config: + datasource: WSO2_PERSISTENCE_DB + table: PERSISTENCE_TABLE + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + # Datasource Configurations +wso2.datasources: + dataSources: + - + definition: + configuration: + connectionTestQuery: "SELECT 1" + driverClassName: com.mysql.jdbc.Driver + idleTimeout: 60000 + isAutoCommit: false + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_CARBON_DB?useSSL=false' + maxPoolSize: 10 + password: wso2carbon + username: wso2carbon + validationTimeout: 30000 + type: RDBMS + description: "The datasource used for registry and user manager" + name: WSO2_CARBON_DB + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_METRICS_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_STATUS_DASHBOARD_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/wso2_status_dashboard + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_STATUS_DASHBOARD_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_CLUSTER_DB + description: The MySQL datasource used for Cluster Coordination + jndiConfig: + name: jdbc/WSO2ClusterDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_CLUSTER_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERSISTENCE_DB + description: The MySQL datasource used for system persistence + jndiConfig: + name: jdbc/WSO2PersistenceDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_PERSISTENCE_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for permission feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + validationTimeout: 30000 + isAutoCommit: false + + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: GEO_LOCATION_DATA +# description: "The data source used for geo location database" +# jndiConfig: +# name: jdbc/GEO_LOCATION_DATA +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: APIM_ANALYTICS_DB +# description: "The datasource used for APIM statistics aggregated data." +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: WSO2AM_MGW_ANALYTICS_DB +# description: "The datasource used for APIM MGW analytics data." +# jndiConfig: +# name: jdbc/WSO2AM_MGW_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +siddhi: + extensions: + - + extension: + name: 'findCountryFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + - + extension: + name: 'findCityFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + + # Cluster Configuration +cluster.config: + enabled: true + groupId: ei.analytics + coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy + strategyConfig: + datasource: WSO2_CLUSTER_DB + heartbeatInterval: 1000 + heartbeatMaxRetry: 2 + eventPollingInterval: 1000 + +deployment.config: + type: ha + eventByteBufferQueueCapacity: 20000 + byteBufferExtractorThreadPoolSize: 5 + eventSyncServer: + host: ${NODE_IP} + port: 9894 + bossThreads: 10 + workerThreads: 10 + eventSyncClientPool: + maxActive: 10 + maxTotal: 10 + maxIdle: 10 + maxWait: 60000 + minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Two node HA +#deployment.config: +# type: ha +# eventSyncServer: +# host: localhost +# port: 9893 +# advertisedHost: localhost +# advertisedPort: 9893 +# bossThreads: 10 +# workerThreads: 10 +# eventSyncClientPool: +# maxActive: 10 +# maxTotal: 10 +# maxIdle: 10 +# maxWait: 60000 +# minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Distributed deployment +#deployment.config: +# type: distributed +# httpsInterface: +# host: 192.168.1.3 +# port: 9443 +# username: admin +# password: admin +# leaderRetryInterval: 10000 +# resourceManagers: +# - host: 192.168.1.1 +# port: 9543 +# username: admin +# password: admin +# - host: 192.168.1.2 +# port: 9543 +# username: admin +# password: admin diff --git a/integrator-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/integrator-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json deleted file mode 100644 index bae5c064..00000000 --- a/integrator-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "store": { - "types": ["fs"] - }, - "gadgetGeneration" :{ - "isCreateGadgetEnable": false, - "ignoreProviders": ["rt"] - }, - "authentication": { - "activeMethod": "basic", - "methods": { - "sso": { - "attributes": { - "issuer": "portal", - "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": true, - "validateAssertionValidityPeriod": true, - "validateAudienceRestriction": true, - "assertionSigningEnabled": true, - "acs": "https://localhost:9444/portal/acs", - "identityAlias": "wso2carbon", - "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "grantType": "urn:ietf:params:oauth:grant-type:saml2-bearer", - "useTenantKey": false, - "isPassive": false - } - }, - "basic": { - "attributes": {} - } - } - }, - "authorization": { - "activeMethod": "", - "methods": { - "oauth": { - "attributes": { - "apimgt-gateway": false, - "oauthProvider": { - "appRegistration": { - "appType": "webapp", - "clientName": "portal", - "owner": "admin", - "password":"admin", - "dynamicClientAppRegistrationServiceURL": "%https.host%/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", - "tokenScope": "admin", - "callbackUrl": "%https.host%/portal", - "saasApp":true - }, - "tokenServiceURL": "%https.host%/oauth2/token" - }, - "adminUser":"admin@carbon.super", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "scopes" : [ - "device:view" - ] - } - } - } - }, - "designers": [ - "Internal/everyone" - ], - "tenantPrefix": "/t", - "shareStore": false, - "theme": "basic", - "cacheTimeoutSeconds": "5", - "cacheSizeBytes": "1073741824", - "defaultDashboardRedirect": false, - "isCreateGadgetEnable": true, - "isSecureVaultEnabled" : false, - "assets": { - "gadget": { - "fileSizeLimit": 5 - }, - "layout": { - "fileSizeLimit": 1 - } - }, - "oauth": { - "username": "admin", - "password": "admin" - }, - "host": { - "hostname": "localhost", - "port": "9444", - "protocol": "" - }, - "queryParameters" : { - "passBetweenPages" : ["shared"] - } -} diff --git a/integrator-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat b/integrator-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat deleted file mode 100644 index 6e2734db..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat +++ /dev/null @@ -1 +0,0 @@ -wso2ei-analytics-2 diff --git a/integrator-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf b/integrator-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf deleted file mode 100755 index 92fbc882..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf +++ /dev/null @@ -1,122 +0,0 @@ -# ------------------------------------------------------ -# CARBON RELATED SPARK PROPERTIES -# ------------------------------------------------------ -# Carbon specific properties when running Spark in the Carbon environment. -# Should start with the prefix "carbon." - -# carbon.spark.master config has 3 states -# 1. (default) local mode - spark starts in the local mode (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master local" or "carbon.spark.master local[2]" -# 2. client mode - DAS acts as a client for an external Spark cluster (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master spark://:" -# 3. cluster mode - DAS creates its own Spark cluster usign Carbon Clustering -# ex: "carbon.spark.master local" AND "carbon.spark.master.count " - -carbon.spark.master local -carbon.spark.master.count 2 - -#This configuration is used to limit the number of results returned from spark query execution -#To return all the results, set this to -1 -carbon.spark.results.limit 1000 - -# Below configuratoin can be used to point to a symbolic link to WSO2 DAS HOME -# carbon.das.symbolic.link /home/ubuntu/das/das_symlink/ - -# Below configuration can be used with the spark fair scheduler, when fair schedule pools are used. the -# defualt pool name for carbon is 'carbon-pool' -# carbon.scheduler.pool carbon-pool - - - -# ------------------------------------------------------ -# SPARK PROPERTIES -# ------------------------------------------------------ -# Default system properties included when running spark. -# This is useful for setting default environmental settings. -# Check http://spark.apache.org/docs/latest/configuration.html for further information - -# Application (Spark Driver) Properties -# ------------------------------------------------------ -spark.app.name CarbonAnalytics -# Spark Driver will be running inside the carbon JVM. Hence the below properties are obsolete -# spark.driver.cores 1 -# spark.driver.memory 512m - -# Runtime Environment -# ------------------------------------------------------ - -# Spark UI -spark.ui.port 4040 -spark.history.ui.port 18080 - -# Compression and Serialization -spark.serializer org.apache.spark.serializer.KryoSerializer -spark.kryoserializer.buffer 256k -spark.kryoserializer.buffer.max 256m - -# Execution Behavior - -# Networking -spark.blockManager.port 12000 -spark.broadcast.port 12500 -spark.driver.port 13000 -spark.executor.port 13500 -spark.fileserver.port 14000 -spark.replClassServer.port 14500 -spark.akka.timeout 1000s - -# Scheduling -spark.scheduler.mode FAIR -# this property can be set to specify where hte fairscheduler.xml file is. the carbon specific -# fairscheduler.xml is in the /repository/conf/analytics/spark directory -# spark.scheduler.allocation.file /repository/conf/analytics/spark/fairscheduler.xml - -# Dynamic Allocation - -# Security - -# Encryption - -# Standalone Cluster Configs -spark.deploy.recoveryMode CUSTOM -spark.deploy.recoveryMode.factory org.wso2.carbon.analytics.spark.core.deploy.AnalyticsRecoveryModeFactory - -# Master -spark.master.port 7077 -spark.master.rest.port 6066 -spark.master.webui.port 8081 - -# Worker -spark.worker.cores 1 -spark.worker.memory 1g -spark.worker.dir work -spark.worker.port 11000 -spark.worker.webui.port 11500 - -# Executors -# spark.executor.cores 1 ; Default: Takes all the available cores in the worker -spark.executor.memory 1g -spark.executor.logs.rolling.strategy size -spark.executor.logs.rolling.maxSize 10000000 -spark.executor.logs.rolling.maxRetainedFiles 10 - -# spark.cores.max ; Default: Int.MAX_VALUE; The maximum amount of CPU cores to request for the application from across -# the cluster (not from each machine) - - -# Spark Logging -# ------------------------------------------------------ -# To allow event logging for spark you need to uncomment -# the line spark.eventlog.log true and set the directory in which the -# logs will be stored. - -# spark.eventLog.enabled true -# spark.eventLog.dir - -# YARN related configs -# ------------------------------------------------------ -# spark.yarn.jar - - diff --git a/integrator-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml b/integrator-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml deleted file mode 100644 index 6ba29b1c..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml +++ /dev/null @@ -1,719 +0,0 @@ - - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Enterprise Integrator-6.3.0 - - - WSO2 Enterprise Integrator-6.3.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - kubernetes - - - - - wso2.ei.analytics.domain - - - - - - 45564 - - 100 - - 60 - - - - - - ei-analytics-2 - - - - - - 4000 - - - - - - - - - - - org.wso2.carbon.membership.scheme.kubernetes.KubernetesMembershipScheme - wso2 - integrator-with-analytics-ei-analytics-1-service,integrator-with-analytics-ei-analytics-2-service - true - false - - - - - - - - - - diff --git a/integrator-analytics/confs/ei-analytics-2/conf/carbon.xml b/integrator-analytics/confs/ei-analytics-2/conf/carbon.xml deleted file mode 100644 index 0a155002..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/carbon.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - WSO2 Enterprise Integrator Analytics - - - EI - - - 6.0.0 - - - wso2ei-analytics - - - wso2ei-analytics - - - local:/${carbon.context}/services/ - - - - - - - DataAnalyticsServer - ComplexEventProcessor - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 1 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 153722867280912 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - true - allow - - - - - - - - - - - false - - (.*)(/images|/css|/js|/docs)(.*) - - - - - - - true - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://product-dist.wso2.com/p2/carbon/releases/wilkes/ - - - - - - - - true - - - - - - true - - diff --git a/integrator-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml b/integrator-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml deleted file mode 100644 index 6c2097d4..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - - - WSO2_ANALYTICS_EVENT_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_ANALYTICS_EVENT_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - - - - - - - - - diff --git a/integrator-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml b/integrator-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml deleted file mode 100644 index af23d572..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - WSO2_CARBON_DB - The datasource used for registry and user manager - - jdbc/WSO2CarbonDB - - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_CONFIG_DB - The datasource used for config registry - - jdbc/WSO2ConfigDB - - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2EI_INTEGRATOR_CONFIG_GOV_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 80 - 60000 - true - SELECT 1 - 30000 - - - - - WSO2_USER_DB - The datasource is used for user mangement and userstore - - jdbc/WSO2UserDB - - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2EI_USER_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - - - - - - - - diff --git a/integrator-analytics/confs/ei-analytics-2/conf/event-processor.xml b/integrator-analytics/confs/ei-analytics-2/conf/event-processor.xml deleted file mode 100644 index 1d13b213..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/event-processor.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - 10000 - - integrator-with-analytics-ei-analytics - 11224 - 20000 - 20000 - - 5242880 - - UTF-8 - 1024 - 30000 - - 1000000 - - 10 - - 1000000 - - 10 - - - integrator-with-analytics-ei-analytics - 10005 - 15000 - 10000 - - - integrator-with-analytics-ei-analytics - 11000 - - 5242880 - - UTF-8 - 1024 - 30000 - - - 15 - 10 - - cep_persistence - - - - - - - - - - - 0.0.0.0 - 8904 - - - 0.0.0.0 - 11000 - - - - - - - localhost - 8904 - - - localhost - 8905 - - - - 20000 - - 5000 - - 10000 - - - - - - 15000 - 15100 - - - 20000 - - 8192 - - 8192 - - 5242880 - - UTF-8 - - 10000 - - 20000 - - - - 1024 - - 5242880 - - UTF-8 - - 20000 - - - - 60000 - 60000 - - - org.wso2.cep.storm.dependencies.jar - - - - 20000 - - - - - diff --git a/integrator-analytics/confs/ei-analytics-2/conf/registry.xml b/integrator-analytics/confs/ei-analytics-2/conf/registry.xml deleted file mode 100644 index 61068d93..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/registry.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - jdbc/WSO2ConfigDB - - - wso2config - wso2config - false - / - - - wso2config - /_system/config/ei_analytics - - - wso2config - /_system/governance/ei_analytics - - - - - - - - - - - - - 35 - 3 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/integrator-analytics/confs/ei-analytics-2/conf/user-mgt.xml b/integrator-analytics/confs/ei-analytics-2/conf/user-mgt.xml deleted file mode 100644 index 801f8cac..00000000 --- a/integrator-analytics/confs/ei-analytics-2/conf/user-mgt.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - true - jdbc/WSO2UserDB - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - true - true - ^[\S]{3,30}$ - ^[\S]{3,30}$ - Username pattern policy violated - ^[\S]{5,30}$ - ^[\S]{5,30}$ - Password length should be within 5 to 30 characters - ^[\S]{3,30}$ - ^[\S]{3,30}$ - true - false - true - SHA-256 - true - , - 100 - 100 - true - false - - - - - - - - - - - - - /permission - true - false - - - - - diff --git a/integrator-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml b/integrator-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml new file mode 100644 index 00000000..da56ca5b --- /dev/null +++ b/integrator-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml @@ -0,0 +1,650 @@ +################################################################################ +# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: ${NODE_IP} + # server name + name: WSO2 EI integrator Analytics + # dashboard type + # ports used by this server + ports: + # port offset + offset: 0 + type: wso2-ei-analytics + +wso2.transport.http: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 9091 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 9444 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + senderConfigurations: + - + id: "http-sender" + +siddhi.stores.query.api: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 7070 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 7443 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7612' + sslPort: '7712' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: ${NODE_IP} + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + +# This is the main configuration for metrics +wso2.metrics: + # Enable Metrics + enabled: true + reporting: + console: + - # The name for the Console Reporter + name: Console + + # Enable Console Reporter + enabled: false + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and printing in the console + pollingPeriod: 5 + +wso2.metrics.jdbc: + # Data Source Configurations for JDBC Reporters + dataSource: + # Default Data Source Configuration + - &JDBC01 + # JNDI name of the data source to be used by the JDBC Reporter. + # This data source should be defined in a *-datasources.xml file in conf/datasources directory. + dataSourceName: java:comp/env/jdbc/WSO2MetricsDB + # Schedule regular deletion of metrics data older than a set number of days. + # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. + # Deleting data older than seven days should be sufficient. + scheduledCleanup: + # Enable scheduled cleanup to delete Metrics data in the database. + enabled: true + + # The scheduled job will cleanup all data older than the specified days + daysToKeep: 7 + + # This is the period for each cleanup operation in seconds. + scheduledCleanupPeriod: 86400 + + # The JDBC Reporter is in the Metrics JDBC Core feature + reporting: + # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime + jdbc: + - # The name for the JDBC Reporter + name: JDBC + + # Enable JDBC Reporter + enabled: true + + # Source of Metrics, which will be used to identify each metric in database --> + # Commented to use the hostname by default + # source: Carbon + + # Alias referring to the Data Source configuration + dataSource: *JDBC01 + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and updating the database with the values + pollingPeriod: 60 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # Periodic Persistence Configuration +state.persistence: + enabled: true + intervalInMin: 1 + revisionsToKeep: 3 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.DBPersistenceStore + config: + datasource: WSO2_PERSISTENCE_DB + table: PERSISTENCE_TABLE + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + # Datasource Configurations +wso2.datasources: + dataSources: + - + definition: + configuration: + connectionTestQuery: "SELECT 1" + driverClassName: com.mysql.jdbc.Driver + idleTimeout: 60000 + isAutoCommit: false + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_CARBON_DB?useSSL=false' + maxPoolSize: 10 + password: wso2carbon + username: wso2carbon + validationTimeout: 30000 + type: RDBMS + description: "The datasource used for registry and user manager" + name: WSO2_CARBON_DB + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_METRICS_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_STATUS_DASHBOARD_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/wso2_status_dashboard + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_STATUS_DASHBOARD_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_CLUSTER_DB + description: The MySQL datasource used for Cluster Coordination + jndiConfig: + name: jdbc/WSO2ClusterDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_CLUSTER_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERSISTENCE_DB + description: The MySQL datasource used for system persistence + jndiConfig: + name: jdbc/WSO2PersistenceDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/WSO2_PERSISTENCE_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for permission feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + validationTimeout: 30000 + isAutoCommit: false + + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: GEO_LOCATION_DATA +# description: "The data source used for geo location database" +# jndiConfig: +# name: jdbc/GEO_LOCATION_DATA +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: APIM_ANALYTICS_DB +# description: "The datasource used for APIM statistics aggregated data." +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: WSO2AM_MGW_ANALYTICS_DB +# description: "The datasource used for APIM MGW analytics data." +# jndiConfig: +# name: jdbc/WSO2AM_MGW_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +siddhi: + extensions: + - + extension: + name: 'findCountryFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + - + extension: + name: 'findCityFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + + # Cluster Configuration +cluster.config: + enabled: true + groupId: ei.analytics + coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy + strategyConfig: + datasource: WSO2_CLUSTER_DB + heartbeatInterval: 1000 + heartbeatMaxRetry: 2 + eventPollingInterval: 1000 + +deployment.config: + type: ha + eventByteBufferQueueCapacity: 20000 + byteBufferExtractorThreadPoolSize: 5 + eventSyncServer: + host: ${NODE_IP} + port: 9894 + bossThreads: 10 + workerThreads: 10 + eventSyncClientPool: + maxActive: 10 + maxTotal: 10 + maxIdle: 10 + maxWait: 60000 + minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Two node HA +#deployment.config: +# type: ha +# eventSyncServer: +# host: localhost +# port: 9893 +# advertisedHost: localhost +# advertisedPort: 9893 +# bossThreads: 10 +# workerThreads: 10 +# eventSyncClientPool: +# maxActive: 10 +# maxTotal: 10 +# maxIdle: 10 +# maxWait: 60000 +# minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Distributed deployment +#deployment.config: +# type: distributed +# httpsInterface: +# host: 192.168.1.3 +# port: 9443 +# username: admin +# password: admin +# leaderRetryInterval: 10000 +# resourceManagers: +# - host: 192.168.1.1 +# port: 9543 +# username: admin +# password: admin +# - host: 192.168.1.2 +# port: 9543 +# username: admin +# password: admin diff --git a/integrator-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/integrator-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json deleted file mode 100644 index bae5c064..00000000 --- a/integrator-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "store": { - "types": ["fs"] - }, - "gadgetGeneration" :{ - "isCreateGadgetEnable": false, - "ignoreProviders": ["rt"] - }, - "authentication": { - "activeMethod": "basic", - "methods": { - "sso": { - "attributes": { - "issuer": "portal", - "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": true, - "validateAssertionValidityPeriod": true, - "validateAudienceRestriction": true, - "assertionSigningEnabled": true, - "acs": "https://localhost:9444/portal/acs", - "identityAlias": "wso2carbon", - "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "grantType": "urn:ietf:params:oauth:grant-type:saml2-bearer", - "useTenantKey": false, - "isPassive": false - } - }, - "basic": { - "attributes": {} - } - } - }, - "authorization": { - "activeMethod": "", - "methods": { - "oauth": { - "attributes": { - "apimgt-gateway": false, - "oauthProvider": { - "appRegistration": { - "appType": "webapp", - "clientName": "portal", - "owner": "admin", - "password":"admin", - "dynamicClientAppRegistrationServiceURL": "%https.host%/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", - "tokenScope": "admin", - "callbackUrl": "%https.host%/portal", - "saasApp":true - }, - "tokenServiceURL": "%https.host%/oauth2/token" - }, - "adminUser":"admin@carbon.super", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "scopes" : [ - "device:view" - ] - } - } - } - }, - "designers": [ - "Internal/everyone" - ], - "tenantPrefix": "/t", - "shareStore": false, - "theme": "basic", - "cacheTimeoutSeconds": "5", - "cacheSizeBytes": "1073741824", - "defaultDashboardRedirect": false, - "isCreateGadgetEnable": true, - "isSecureVaultEnabled" : false, - "assets": { - "gadget": { - "fileSizeLimit": 5 - }, - "layout": { - "fileSizeLimit": 1 - } - }, - "oauth": { - "username": "admin", - "password": "admin" - }, - "host": { - "hostname": "localhost", - "port": "9444", - "protocol": "" - }, - "queryParameters" : { - "passBetweenPages" : ["shared"] - } -} diff --git a/integrator-analytics/confs/integrator/conf/axis2/axis2.xml b/integrator-analytics/confs/integrator/conf/axis2/axis2.xml index b0a8bca5..1be24a92 100644 --- a/integrator-analytics/confs/integrator/conf/axis2/axis2.xml +++ b/integrator-analytics/confs/integrator/conf/axis2/axis2.xml @@ -62,8 +62,8 @@ axis2modules - WSO2 EI 6.3.0 - WSO2 EI 6.3.0 + WSO2 EI 6.4.0 + WSO2 EI 6.4.0 diff --git a/integrator-analytics/confs/integrator/conf/carbon.xml b/integrator-analytics/confs/integrator/conf/carbon.xml index d81f458a..707c20f9 100644 --- a/integrator-analytics/confs/integrator/conf/carbon.xml +++ b/integrator-analytics/confs/integrator/conf/carbon.xml @@ -36,7 +36,7 @@ - 6.3.0 + 6.4.0 - + + + + + + true + + + org.wso2.carbon.crypto.provider.KeyStoreBasedInternalCryptoProvider + + + org.wso2.carbon.core.encryption.KeyStoreBasedExternalCryptoProvider + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + axis2modules - WSO2 EI 6.3.0 - Broker - WSO2 EI 6.3.0 - Broker + WSO2 EI 6.4.0 - Broker + WSO2 EI 6.4.0 - Broker diff --git a/integrator-broker-analytics/confs/broker/broker.xml b/integrator-broker-analytics/confs/broker/broker.xml index bf5a1da1..74141931 100644 --- a/integrator-broker-analytics/confs/broker/broker.xml +++ b/integrator-broker-analytics/confs/broker/broker.xml @@ -89,6 +89,12 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c wso2carbon SunX509 + + TLSv1 + + 10 @@ -264,6 +270,10 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c 20 + + + 30 - + + + + + + true + + + org.wso2.carbon.crypto.provider.KeyStoreBasedInternalCryptoProvider + + + org.wso2.carbon.core.encryption.KeyStoreBasedExternalCryptoProvider + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Enterprise Integrator-6.3.0 - - - WSO2 Enterprise Integrator-6.3.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - kubernetes - - - - - wso2.ei.analytics.domain - - - - - - 45564 - - 100 - - 60 - - - - - - ei-analytics-1 - - - - - - 4000 - - - - - - - - - - - org.wso2.carbon.membership.scheme.kubernetes.KubernetesMembershipScheme - wso2 - wso2ei-analytics-1-service,wso2ei-analytics-2-service - true - false - - - - - - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-1/conf/carbon.xml b/integrator-broker-analytics/confs/ei-analytics-1/conf/carbon.xml deleted file mode 100644 index 0a155002..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-1/conf/carbon.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - WSO2 Enterprise Integrator Analytics - - - EI - - - 6.0.0 - - - wso2ei-analytics - - - wso2ei-analytics - - - local:/${carbon.context}/services/ - - - - - - - DataAnalyticsServer - ComplexEventProcessor - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 1 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 153722867280912 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - true - allow - - - - - - - - - - - false - - (.*)(/images|/css|/js|/docs)(.*) - - - - - - - true - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://product-dist.wso2.com/p2/carbon/releases/wilkes/ - - - - - - - - true - - - - - - true - - diff --git a/integrator-broker-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml b/integrator-broker-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml deleted file mode 100644 index c5c120ab..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - - - WSO2_ANALYTICS_EVENT_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_ANALYTICS_EVENT_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - - - - - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml b/integrator-broker-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml deleted file mode 100644 index bca52067..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - WSO2_CARBON_DB - The datasource used for registry and user manager - - jdbc/WSO2CarbonDB - - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_CONFIG_DB - The datasource used for config registry - - jdbc/WSO2ConfigDB - - - - jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2EI_INTEGRATOR_CONFIG_GOV_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 80 - 60000 - true - SELECT 1 - 30000 - - - - - WSO2_USER_DB - The datasource is used for user mangement and userstore - - jdbc/WSO2UserDB - - - - jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2EI_USER_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - - - - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-1/conf/event-processor.xml b/integrator-broker-analytics/confs/ei-analytics-1/conf/event-processor.xml deleted file mode 100644 index 1d13b213..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-1/conf/event-processor.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - 10000 - - integrator-with-analytics-ei-analytics - 11224 - 20000 - 20000 - - 5242880 - - UTF-8 - 1024 - 30000 - - 1000000 - - 10 - - 1000000 - - 10 - - - integrator-with-analytics-ei-analytics - 10005 - 15000 - 10000 - - - integrator-with-analytics-ei-analytics - 11000 - - 5242880 - - UTF-8 - 1024 - 30000 - - - 15 - 10 - - cep_persistence - - - - - - - - - - - 0.0.0.0 - 8904 - - - 0.0.0.0 - 11000 - - - - - - - localhost - 8904 - - - localhost - 8905 - - - - 20000 - - 5000 - - 10000 - - - - - - 15000 - 15100 - - - 20000 - - 8192 - - 8192 - - 5242880 - - UTF-8 - - 10000 - - 20000 - - - - 1024 - - 5242880 - - UTF-8 - - 20000 - - - - 60000 - 60000 - - - org.wso2.cep.storm.dependencies.jar - - - - 20000 - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-1/conf/registry.xml b/integrator-broker-analytics/confs/ei-analytics-1/conf/registry.xml deleted file mode 100644 index 61068d93..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-1/conf/registry.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - jdbc/WSO2ConfigDB - - - wso2config - wso2config - false - / - - - wso2config - /_system/config/ei_analytics - - - wso2config - /_system/governance/ei_analytics - - - - - - - - - - - - - 35 - 3 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/integrator-broker-analytics/confs/ei-analytics-1/conf/user-mgt.xml b/integrator-broker-analytics/confs/ei-analytics-1/conf/user-mgt.xml deleted file mode 100644 index 801f8cac..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-1/conf/user-mgt.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - true - jdbc/WSO2UserDB - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - true - true - ^[\S]{3,30}$ - ^[\S]{3,30}$ - Username pattern policy violated - ^[\S]{5,30}$ - ^[\S]{5,30}$ - Password length should be within 5 to 30 characters - ^[\S]{3,30}$ - ^[\S]{3,30}$ - true - false - true - SHA-256 - true - , - 100 - 100 - true - false - - - - - - - - - - - - - /permission - true - false - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml b/integrator-broker-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml new file mode 100644 index 00000000..37c59257 --- /dev/null +++ b/integrator-broker-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml @@ -0,0 +1,650 @@ +################################################################################ +# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: ${NODE_IP} + # server name + name: WSO2 EI integrator Analytics + # dashboard type + # ports used by this server + ports: + # port offset + offset: 0 + type: wso2-ei-analytics + +wso2.transport.http: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 9091 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 9444 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + senderConfigurations: + - + id: "http-sender" + +siddhi.stores.query.api: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 7070 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 7443 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7612' + sslPort: '7712' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: ${NODE_IP} + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + +# This is the main configuration for metrics +wso2.metrics: + # Enable Metrics + enabled: true + reporting: + console: + - # The name for the Console Reporter + name: Console + + # Enable Console Reporter + enabled: false + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and printing in the console + pollingPeriod: 5 + +wso2.metrics.jdbc: + # Data Source Configurations for JDBC Reporters + dataSource: + # Default Data Source Configuration + - &JDBC01 + # JNDI name of the data source to be used by the JDBC Reporter. + # This data source should be defined in a *-datasources.xml file in conf/datasources directory. + dataSourceName: java:comp/env/jdbc/WSO2MetricsDB + # Schedule regular deletion of metrics data older than a set number of days. + # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. + # Deleting data older than seven days should be sufficient. + scheduledCleanup: + # Enable scheduled cleanup to delete Metrics data in the database. + enabled: true + + # The scheduled job will cleanup all data older than the specified days + daysToKeep: 7 + + # This is the period for each cleanup operation in seconds. + scheduledCleanupPeriod: 86400 + + # The JDBC Reporter is in the Metrics JDBC Core feature + reporting: + # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime + jdbc: + - # The name for the JDBC Reporter + name: JDBC + + # Enable JDBC Reporter + enabled: true + + # Source of Metrics, which will be used to identify each metric in database --> + # Commented to use the hostname by default + # source: Carbon + + # Alias referring to the Data Source configuration + dataSource: *JDBC01 + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and updating the database with the values + pollingPeriod: 60 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # Periodic Persistence Configuration +state.persistence: + enabled: true + intervalInMin: 1 + revisionsToKeep: 3 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.DBPersistenceStore + config: + datasource: WSO2_PERSISTENCE_DB + table: PERSISTENCE_TABLE + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + # Datasource Configurations +wso2.datasources: + dataSources: + - + definition: + configuration: + connectionTestQuery: "SELECT 1" + driverClassName: com.mysql.jdbc.Driver + idleTimeout: 60000 + isAutoCommit: false + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_CARBON_DB?useSSL=false' + maxPoolSize: 10 + password: wso2carbon + username: wso2carbon + validationTimeout: 30000 + type: RDBMS + description: "The datasource used for registry and user manager" + name: WSO2_CARBON_DB + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_METRICS_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_STATUS_DASHBOARD_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/wso2_status_dashboard + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_STATUS_DASHBOARD_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_CLUSTER_DB + description: The MySQL datasource used for Cluster Coordination + jndiConfig: + name: jdbc/WSO2ClusterDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_CLUSTER_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERSISTENCE_DB + description: The MySQL datasource used for system persistence + jndiConfig: + name: jdbc/WSO2PersistenceDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_PERSISTENCE_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for permission feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + validationTimeout: 30000 + isAutoCommit: false + + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: GEO_LOCATION_DATA +# description: "The data source used for geo location database" +# jndiConfig: +# name: jdbc/GEO_LOCATION_DATA +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: APIM_ANALYTICS_DB +# description: "The datasource used for APIM statistics aggregated data." +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: WSO2AM_MGW_ANALYTICS_DB +# description: "The datasource used for APIM MGW analytics data." +# jndiConfig: +# name: jdbc/WSO2AM_MGW_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +siddhi: + extensions: + - + extension: + name: 'findCountryFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + - + extension: + name: 'findCityFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + + # Cluster Configuration +cluster.config: + enabled: true + groupId: ei.analytics + coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy + strategyConfig: + datasource: WSO2_CLUSTER_DB + heartbeatInterval: 1000 + heartbeatMaxRetry: 2 + eventPollingInterval: 1000 + +deployment.config: + type: ha + eventByteBufferQueueCapacity: 20000 + byteBufferExtractorThreadPoolSize: 5 + eventSyncServer: + host: ${NODE_IP} + port: 9894 + bossThreads: 10 + workerThreads: 10 + eventSyncClientPool: + maxActive: 10 + maxTotal: 10 + maxIdle: 10 + maxWait: 60000 + minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Two node HA +#deployment.config: +# type: ha +# eventSyncServer: +# host: localhost +# port: 9893 +# advertisedHost: localhost +# advertisedPort: 9893 +# bossThreads: 10 +# workerThreads: 10 +# eventSyncClientPool: +# maxActive: 10 +# maxTotal: 10 +# maxIdle: 10 +# maxWait: 60000 +# minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Distributed deployment +#deployment.config: +# type: distributed +# httpsInterface: +# host: 192.168.1.3 +# port: 9443 +# username: admin +# password: admin +# leaderRetryInterval: 10000 +# resourceManagers: +# - host: 192.168.1.1 +# port: 9543 +# username: admin +# password: admin +# - host: 192.168.1.2 +# port: 9543 +# username: admin +# password: admin diff --git a/integrator-broker-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/integrator-broker-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json deleted file mode 100644 index bae5c064..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "store": { - "types": ["fs"] - }, - "gadgetGeneration" :{ - "isCreateGadgetEnable": false, - "ignoreProviders": ["rt"] - }, - "authentication": { - "activeMethod": "basic", - "methods": { - "sso": { - "attributes": { - "issuer": "portal", - "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": true, - "validateAssertionValidityPeriod": true, - "validateAudienceRestriction": true, - "assertionSigningEnabled": true, - "acs": "https://localhost:9444/portal/acs", - "identityAlias": "wso2carbon", - "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "grantType": "urn:ietf:params:oauth:grant-type:saml2-bearer", - "useTenantKey": false, - "isPassive": false - } - }, - "basic": { - "attributes": {} - } - } - }, - "authorization": { - "activeMethod": "", - "methods": { - "oauth": { - "attributes": { - "apimgt-gateway": false, - "oauthProvider": { - "appRegistration": { - "appType": "webapp", - "clientName": "portal", - "owner": "admin", - "password":"admin", - "dynamicClientAppRegistrationServiceURL": "%https.host%/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", - "tokenScope": "admin", - "callbackUrl": "%https.host%/portal", - "saasApp":true - }, - "tokenServiceURL": "%https.host%/oauth2/token" - }, - "adminUser":"admin@carbon.super", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "scopes" : [ - "device:view" - ] - } - } - } - }, - "designers": [ - "Internal/everyone" - ], - "tenantPrefix": "/t", - "shareStore": false, - "theme": "basic", - "cacheTimeoutSeconds": "5", - "cacheSizeBytes": "1073741824", - "defaultDashboardRedirect": false, - "isCreateGadgetEnable": true, - "isSecureVaultEnabled" : false, - "assets": { - "gadget": { - "fileSizeLimit": 5 - }, - "layout": { - "fileSizeLimit": 1 - } - }, - "oauth": { - "username": "admin", - "password": "admin" - }, - "host": { - "hostname": "localhost", - "port": "9444", - "protocol": "" - }, - "queryParameters" : { - "passBetweenPages" : ["shared"] - } -} diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat b/integrator-broker-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat deleted file mode 100644 index 6e2734db..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat +++ /dev/null @@ -1 +0,0 @@ -wso2ei-analytics-2 diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf b/integrator-broker-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf deleted file mode 100755 index 92fbc882..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf +++ /dev/null @@ -1,122 +0,0 @@ -# ------------------------------------------------------ -# CARBON RELATED SPARK PROPERTIES -# ------------------------------------------------------ -# Carbon specific properties when running Spark in the Carbon environment. -# Should start with the prefix "carbon." - -# carbon.spark.master config has 3 states -# 1. (default) local mode - spark starts in the local mode (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master local" or "carbon.spark.master local[2]" -# 2. client mode - DAS acts as a client for an external Spark cluster (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master spark://:" -# 3. cluster mode - DAS creates its own Spark cluster usign Carbon Clustering -# ex: "carbon.spark.master local" AND "carbon.spark.master.count " - -carbon.spark.master local -carbon.spark.master.count 2 - -#This configuration is used to limit the number of results returned from spark query execution -#To return all the results, set this to -1 -carbon.spark.results.limit 1000 - -# Below configuratoin can be used to point to a symbolic link to WSO2 DAS HOME -# carbon.das.symbolic.link /home/ubuntu/das/das_symlink/ - -# Below configuration can be used with the spark fair scheduler, when fair schedule pools are used. the -# defualt pool name for carbon is 'carbon-pool' -# carbon.scheduler.pool carbon-pool - - - -# ------------------------------------------------------ -# SPARK PROPERTIES -# ------------------------------------------------------ -# Default system properties included when running spark. -# This is useful for setting default environmental settings. -# Check http://spark.apache.org/docs/latest/configuration.html for further information - -# Application (Spark Driver) Properties -# ------------------------------------------------------ -spark.app.name CarbonAnalytics -# Spark Driver will be running inside the carbon JVM. Hence the below properties are obsolete -# spark.driver.cores 1 -# spark.driver.memory 512m - -# Runtime Environment -# ------------------------------------------------------ - -# Spark UI -spark.ui.port 4040 -spark.history.ui.port 18080 - -# Compression and Serialization -spark.serializer org.apache.spark.serializer.KryoSerializer -spark.kryoserializer.buffer 256k -spark.kryoserializer.buffer.max 256m - -# Execution Behavior - -# Networking -spark.blockManager.port 12000 -spark.broadcast.port 12500 -spark.driver.port 13000 -spark.executor.port 13500 -spark.fileserver.port 14000 -spark.replClassServer.port 14500 -spark.akka.timeout 1000s - -# Scheduling -spark.scheduler.mode FAIR -# this property can be set to specify where hte fairscheduler.xml file is. the carbon specific -# fairscheduler.xml is in the /repository/conf/analytics/spark directory -# spark.scheduler.allocation.file /repository/conf/analytics/spark/fairscheduler.xml - -# Dynamic Allocation - -# Security - -# Encryption - -# Standalone Cluster Configs -spark.deploy.recoveryMode CUSTOM -spark.deploy.recoveryMode.factory org.wso2.carbon.analytics.spark.core.deploy.AnalyticsRecoveryModeFactory - -# Master -spark.master.port 7077 -spark.master.rest.port 6066 -spark.master.webui.port 8081 - -# Worker -spark.worker.cores 1 -spark.worker.memory 1g -spark.worker.dir work -spark.worker.port 11000 -spark.worker.webui.port 11500 - -# Executors -# spark.executor.cores 1 ; Default: Takes all the available cores in the worker -spark.executor.memory 1g -spark.executor.logs.rolling.strategy size -spark.executor.logs.rolling.maxSize 10000000 -spark.executor.logs.rolling.maxRetainedFiles 10 - -# spark.cores.max ; Default: Int.MAX_VALUE; The maximum amount of CPU cores to request for the application from across -# the cluster (not from each machine) - - -# Spark Logging -# ------------------------------------------------------ -# To allow event logging for spark you need to uncomment -# the line spark.eventlog.log true and set the directory in which the -# logs will be stored. - -# spark.eventLog.enabled true -# spark.eventLog.dir - -# YARN related configs -# ------------------------------------------------------ -# spark.yarn.jar - - diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml b/integrator-broker-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml deleted file mode 100644 index 0a8b2ee6..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml +++ /dev/null @@ -1,719 +0,0 @@ - - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Enterprise Integrator-6.3.0 - - - WSO2 Enterprise Integrator-6.3.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - kubernetes - - - - - wso2.ei.analytics.domain - - - - - - 45564 - - 100 - - 60 - - - - - - ei-analytics-2 - - - - - - 4000 - - - - - - - - - - - org.wso2.carbon.membership.scheme.kubernetes.KubernetesMembershipScheme - wso2 - wso2ei-analytics-1-service,wso2ei-analytics-2-service - true - false - - - - - - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/carbon.xml b/integrator-broker-analytics/confs/ei-analytics-2/conf/carbon.xml deleted file mode 100644 index 0a155002..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/carbon.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - WSO2 Enterprise Integrator Analytics - - - EI - - - 6.0.0 - - - wso2ei-analytics - - - wso2ei-analytics - - - local:/${carbon.context}/services/ - - - - - - - DataAnalyticsServer - ComplexEventProcessor - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 1 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 153722867280912 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - true - allow - - - - - - - - - - - false - - (.*)(/images|/css|/js|/docs)(.*) - - - - - - - true - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://product-dist.wso2.com/p2/carbon/releases/wilkes/ - - - - - - - - true - - - - - - true - - diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml b/integrator-broker-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml deleted file mode 100644 index c5c120ab..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - - - WSO2_ANALYTICS_EVENT_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_ANALYTICS_EVENT_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - - - - - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml b/integrator-broker-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml deleted file mode 100644 index bca52067..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - WSO2_CARBON_DB - The datasource used for registry and user manager - - jdbc/WSO2CarbonDB - - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_CONFIG_DB - The datasource used for config registry - - jdbc/WSO2ConfigDB - - - - jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2EI_INTEGRATOR_CONFIG_GOV_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 80 - 60000 - true - SELECT 1 - 30000 - - - - - WSO2_USER_DB - The datasource is used for user mangement and userstore - - jdbc/WSO2UserDB - - - - jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2EI_USER_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - - - - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/event-processor.xml b/integrator-broker-analytics/confs/ei-analytics-2/conf/event-processor.xml deleted file mode 100644 index 1d13b213..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/event-processor.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - 10000 - - integrator-with-analytics-ei-analytics - 11224 - 20000 - 20000 - - 5242880 - - UTF-8 - 1024 - 30000 - - 1000000 - - 10 - - 1000000 - - 10 - - - integrator-with-analytics-ei-analytics - 10005 - 15000 - 10000 - - - integrator-with-analytics-ei-analytics - 11000 - - 5242880 - - UTF-8 - 1024 - 30000 - - - 15 - 10 - - cep_persistence - - - - - - - - - - - 0.0.0.0 - 8904 - - - 0.0.0.0 - 11000 - - - - - - - localhost - 8904 - - - localhost - 8905 - - - - 20000 - - 5000 - - 10000 - - - - - - 15000 - 15100 - - - 20000 - - 8192 - - 8192 - - 5242880 - - UTF-8 - - 10000 - - 20000 - - - - 1024 - - 5242880 - - UTF-8 - - 20000 - - - - 60000 - 60000 - - - org.wso2.cep.storm.dependencies.jar - - - - 20000 - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/registry.xml b/integrator-broker-analytics/confs/ei-analytics-2/conf/registry.xml deleted file mode 100644 index 61068d93..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/registry.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - jdbc/WSO2ConfigDB - - - wso2config - wso2config - false - / - - - wso2config - /_system/config/ei_analytics - - - wso2config - /_system/governance/ei_analytics - - - - - - - - - - - - - 35 - 3 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/user-mgt.xml b/integrator-broker-analytics/confs/ei-analytics-2/conf/user-mgt.xml deleted file mode 100644 index 801f8cac..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/conf/user-mgt.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - true - jdbc/WSO2UserDB - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - true - true - ^[\S]{3,30}$ - ^[\S]{3,30}$ - Username pattern policy violated - ^[\S]{5,30}$ - ^[\S]{5,30}$ - Password length should be within 5 to 30 characters - ^[\S]{3,30}$ - ^[\S]{3,30}$ - true - false - true - SHA-256 - true - , - 100 - 100 - true - false - - - - - - - - - - - - - /permission - true - false - - - - - diff --git a/integrator-broker-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml b/integrator-broker-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml new file mode 100644 index 00000000..37c59257 --- /dev/null +++ b/integrator-broker-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml @@ -0,0 +1,650 @@ +################################################################################ +# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: ${NODE_IP} + # server name + name: WSO2 EI integrator Analytics + # dashboard type + # ports used by this server + ports: + # port offset + offset: 0 + type: wso2-ei-analytics + +wso2.transport.http: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 9091 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 9444 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + senderConfigurations: + - + id: "http-sender" + +siddhi.stores.query.api: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 7070 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 7443 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7612' + sslPort: '7712' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: ${NODE_IP} + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + +# This is the main configuration for metrics +wso2.metrics: + # Enable Metrics + enabled: true + reporting: + console: + - # The name for the Console Reporter + name: Console + + # Enable Console Reporter + enabled: false + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and printing in the console + pollingPeriod: 5 + +wso2.metrics.jdbc: + # Data Source Configurations for JDBC Reporters + dataSource: + # Default Data Source Configuration + - &JDBC01 + # JNDI name of the data source to be used by the JDBC Reporter. + # This data source should be defined in a *-datasources.xml file in conf/datasources directory. + dataSourceName: java:comp/env/jdbc/WSO2MetricsDB + # Schedule regular deletion of metrics data older than a set number of days. + # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. + # Deleting data older than seven days should be sufficient. + scheduledCleanup: + # Enable scheduled cleanup to delete Metrics data in the database. + enabled: true + + # The scheduled job will cleanup all data older than the specified days + daysToKeep: 7 + + # This is the period for each cleanup operation in seconds. + scheduledCleanupPeriod: 86400 + + # The JDBC Reporter is in the Metrics JDBC Core feature + reporting: + # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime + jdbc: + - # The name for the JDBC Reporter + name: JDBC + + # Enable JDBC Reporter + enabled: true + + # Source of Metrics, which will be used to identify each metric in database --> + # Commented to use the hostname by default + # source: Carbon + + # Alias referring to the Data Source configuration + dataSource: *JDBC01 + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and updating the database with the values + pollingPeriod: 60 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # Periodic Persistence Configuration +state.persistence: + enabled: true + intervalInMin: 1 + revisionsToKeep: 3 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.DBPersistenceStore + config: + datasource: WSO2_PERSISTENCE_DB + table: PERSISTENCE_TABLE + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + # Datasource Configurations +wso2.datasources: + dataSources: + - + definition: + configuration: + connectionTestQuery: "SELECT 1" + driverClassName: com.mysql.jdbc.Driver + idleTimeout: 60000 + isAutoCommit: false + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_CARBON_DB?useSSL=false' + maxPoolSize: 10 + password: wso2carbon + username: wso2carbon + validationTimeout: 30000 + type: RDBMS + description: "The datasource used for registry and user manager" + name: WSO2_CARBON_DB + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_METRICS_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_STATUS_DASHBOARD_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/wso2_status_dashboard + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_STATUS_DASHBOARD_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_CLUSTER_DB + description: The MySQL datasource used for Cluster Coordination + jndiConfig: + name: jdbc/WSO2ClusterDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_CLUSTER_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERSISTENCE_DB + description: The MySQL datasource used for system persistence + jndiConfig: + name: jdbc/WSO2PersistenceDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/WSO2_PERSISTENCE_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for permission feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://integrator-broker-analytics-rdbms-service:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + validationTimeout: 30000 + isAutoCommit: false + + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: GEO_LOCATION_DATA +# description: "The data source used for geo location database" +# jndiConfig: +# name: jdbc/GEO_LOCATION_DATA +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: APIM_ANALYTICS_DB +# description: "The datasource used for APIM statistics aggregated data." +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: WSO2AM_MGW_ANALYTICS_DB +# description: "The datasource used for APIM MGW analytics data." +# jndiConfig: +# name: jdbc/WSO2AM_MGW_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +siddhi: + extensions: + - + extension: + name: 'findCountryFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + - + extension: + name: 'findCityFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + + # Cluster Configuration +cluster.config: + enabled: true + groupId: ei.analytics + coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy + strategyConfig: + datasource: WSO2_CLUSTER_DB + heartbeatInterval: 1000 + heartbeatMaxRetry: 2 + eventPollingInterval: 1000 + +deployment.config: + type: ha + eventByteBufferQueueCapacity: 20000 + byteBufferExtractorThreadPoolSize: 5 + eventSyncServer: + host: ${NODE_IP} + port: 9894 + bossThreads: 10 + workerThreads: 10 + eventSyncClientPool: + maxActive: 10 + maxTotal: 10 + maxIdle: 10 + maxWait: 60000 + minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Two node HA +#deployment.config: +# type: ha +# eventSyncServer: +# host: localhost +# port: 9893 +# advertisedHost: localhost +# advertisedPort: 9893 +# bossThreads: 10 +# workerThreads: 10 +# eventSyncClientPool: +# maxActive: 10 +# maxTotal: 10 +# maxIdle: 10 +# maxWait: 60000 +# minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Distributed deployment +#deployment.config: +# type: distributed +# httpsInterface: +# host: 192.168.1.3 +# port: 9443 +# username: admin +# password: admin +# leaderRetryInterval: 10000 +# resourceManagers: +# - host: 192.168.1.1 +# port: 9543 +# username: admin +# password: admin +# - host: 192.168.1.2 +# port: 9543 +# username: admin +# password: admin diff --git a/integrator-broker-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/integrator-broker-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json deleted file mode 100644 index bae5c064..00000000 --- a/integrator-broker-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "store": { - "types": ["fs"] - }, - "gadgetGeneration" :{ - "isCreateGadgetEnable": false, - "ignoreProviders": ["rt"] - }, - "authentication": { - "activeMethod": "basic", - "methods": { - "sso": { - "attributes": { - "issuer": "portal", - "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": true, - "validateAssertionValidityPeriod": true, - "validateAudienceRestriction": true, - "assertionSigningEnabled": true, - "acs": "https://localhost:9444/portal/acs", - "identityAlias": "wso2carbon", - "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "grantType": "urn:ietf:params:oauth:grant-type:saml2-bearer", - "useTenantKey": false, - "isPassive": false - } - }, - "basic": { - "attributes": {} - } - } - }, - "authorization": { - "activeMethod": "", - "methods": { - "oauth": { - "attributes": { - "apimgt-gateway": false, - "oauthProvider": { - "appRegistration": { - "appType": "webapp", - "clientName": "portal", - "owner": "admin", - "password":"admin", - "dynamicClientAppRegistrationServiceURL": "%https.host%/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", - "tokenScope": "admin", - "callbackUrl": "%https.host%/portal", - "saasApp":true - }, - "tokenServiceURL": "%https.host%/oauth2/token" - }, - "adminUser":"admin@carbon.super", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "scopes" : [ - "device:view" - ] - } - } - } - }, - "designers": [ - "Internal/everyone" - ], - "tenantPrefix": "/t", - "shareStore": false, - "theme": "basic", - "cacheTimeoutSeconds": "5", - "cacheSizeBytes": "1073741824", - "defaultDashboardRedirect": false, - "isCreateGadgetEnable": true, - "isSecureVaultEnabled" : false, - "assets": { - "gadget": { - "fileSizeLimit": 5 - }, - "layout": { - "fileSizeLimit": 1 - } - }, - "oauth": { - "username": "admin", - "password": "admin" - }, - "host": { - "hostname": "localhost", - "port": "9444", - "protocol": "" - }, - "queryParameters" : { - "passBetweenPages" : ["shared"] - } -} diff --git a/integrator-broker-analytics/confs/integrator/conf/axis2/axis2.xml b/integrator-broker-analytics/confs/integrator/conf/axis2/axis2.xml index 79ab23ba..8cf54c7b 100644 --- a/integrator-broker-analytics/confs/integrator/conf/axis2/axis2.xml +++ b/integrator-broker-analytics/confs/integrator/conf/axis2/axis2.xml @@ -62,8 +62,8 @@ axis2modules - WSO2 EI 6.3.0 - WSO2 EI 6.3.0 + WSO2 EI 6.4.0 + WSO2 EI 6.4.0 diff --git a/integrator-broker-analytics/confs/integrator/conf/carbon.xml b/integrator-broker-analytics/confs/integrator/conf/carbon.xml index d81f458a..707c20f9 100644 --- a/integrator-broker-analytics/confs/integrator/conf/carbon.xml +++ b/integrator-broker-analytics/confs/integrator/conf/carbon.xml @@ -36,7 +36,7 @@ - 6.3.0 + 6.4.0 - + + + + + + true + + + org.wso2.carbon.crypto.provider.KeyStoreBasedInternalCryptoProvider + + + org.wso2.carbon.core.encryption.KeyStoreBasedExternalCryptoProvider + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Enterprise Integrator-6.3.0 - - - WSO2 Enterprise Integrator-6.3.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - kubernetes - - - - - wso2.ei.analytics.domain - - - - - - 45564 - - 100 - - 60 - - - - - - ei-analytics-1 - - - - - - 4000 - - - - - - - - - - - org.wso2.carbon.membership.scheme.kubernetes.KubernetesMembershipScheme - wso2 - integrator-with-analytics-ei-analytics-1-service,integrator-with-analytics-ei-analytics-2-service - true - false - - - - - - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/carbon.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/carbon.xml deleted file mode 100644 index 0a155002..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/carbon.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - WSO2 Enterprise Integrator Analytics - - - EI - - - 6.0.0 - - - wso2ei-analytics - - - wso2ei-analytics - - - local:/${carbon.context}/services/ - - - - - - - DataAnalyticsServer - ComplexEventProcessor - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 1 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 153722867280912 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - true - allow - - - - - - - - - - - false - - (.*)(/images|/css|/js|/docs)(.*) - - - - - - - true - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://product-dist.wso2.com/p2/carbon/releases/wilkes/ - - - - - - - - true - - - - - - true - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml deleted file mode 100644 index 9019ef87..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - - - WSO2_ANALYTICS_EVENT_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_ANALYTICS_EVENT_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - - - - - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml deleted file mode 100644 index a0466472..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - WSO2_CARBON_DB - The datasource used for registry and user manager - - jdbc/WSO2CarbonDB - - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_CONFIG_DB - The datasource used for config registry - - jdbc/WSO2ConfigDB - - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2EI_INTEGRATOR_CONFIG_GOV_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 80 - 60000 - true - SELECT 1 - 30000 - - - - - WSO2_USER_DB - The datasource is used for user mangement and userstore - - jdbc/WSO2UserDB - - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2EI_USER_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - - - - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/event-processor.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/event-processor.xml deleted file mode 100644 index 1d13b213..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/event-processor.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - 10000 - - integrator-with-analytics-ei-analytics - 11224 - 20000 - 20000 - - 5242880 - - UTF-8 - 1024 - 30000 - - 1000000 - - 10 - - 1000000 - - 10 - - - integrator-with-analytics-ei-analytics - 10005 - 15000 - 10000 - - - integrator-with-analytics-ei-analytics - 11000 - - 5242880 - - UTF-8 - 1024 - 30000 - - - 15 - 10 - - cep_persistence - - - - - - - - - - - 0.0.0.0 - 8904 - - - 0.0.0.0 - 11000 - - - - - - - localhost - 8904 - - - localhost - 8905 - - - - 20000 - - 5000 - - 10000 - - - - - - 15000 - 15100 - - - 20000 - - 8192 - - 8192 - - 5242880 - - UTF-8 - - 10000 - - 20000 - - - - 1024 - - 5242880 - - UTF-8 - - 20000 - - - - 60000 - 60000 - - - org.wso2.cep.storm.dependencies.jar - - - - 20000 - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/registry.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/registry.xml deleted file mode 100644 index 61068d93..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/registry.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - jdbc/WSO2ConfigDB - - - wso2config - wso2config - false - / - - - wso2config - /_system/config/ei_analytics - - - wso2config - /_system/governance/ei_analytics - - - - - - - - - - - - - 35 - 3 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml deleted file mode 100644 index 801f8cac..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - true - jdbc/WSO2UserDB - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - true - true - ^[\S]{3,30}$ - ^[\S]{3,30}$ - Username pattern policy violated - ^[\S]{5,30}$ - ^[\S]{5,30}$ - Password length should be within 5 to 30 characters - ^[\S]{3,30}$ - ^[\S]{3,30}$ - true - false - true - SHA-256 - true - , - 100 - 100 - true - false - - - - - - - - - - - - - /permission - true - false - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml new file mode 100644 index 00000000..63765809 --- /dev/null +++ b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml @@ -0,0 +1,632 @@ +################################################################################ +# Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: ${NODE_IP} + # server name + name: WSO2 EI integrator Analytics + # dashboard type + # ports used by this server + ports: + # port offset + offset: 0 + type: wso2-ei-analytics + +wso2.transport.http: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 9091 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 9444 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + senderConfigurations: + - + id: "http-sender" + +siddhi.stores.query.api: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 7070 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 7443 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7612' + sslPort: '7712' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: 0.0.0.0 + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + +# This is the main configuration for metrics +wso2.metrics: + # Enable Metrics + enabled: false + reporting: + console: + - # The name for the Console Reporter + name: Console + + # Enable Console Reporter + enabled: false + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and printing in the console + pollingPeriod: 5 + +wso2.metrics.jdbc: + # Data Source Configurations for JDBC Reporters + dataSource: + # Default Data Source Configuration + - &JDBC01 + # JNDI name of the data source to be used by the JDBC Reporter. + # This data source should be defined in a *-datasources.xml file in conf/datasources directory. + dataSourceName: java:comp/env/jdbc/WSO2MetricsDB + # Schedule regular deletion of metrics data older than a set number of days. + # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. + # Deleting data older than seven days should be sufficient. + scheduledCleanup: + # Enable scheduled cleanup to delete Metrics data in the database. + enabled: true + + # The scheduled job will cleanup all data older than the specified days + daysToKeep: 7 + + # This is the period for each cleanup operation in seconds. + scheduledCleanupPeriod: 86400 + + # The JDBC Reporter is in the Metrics JDBC Core feature + reporting: + # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime + jdbc: + - # The name for the JDBC Reporter + name: JDBC + + # Enable JDBC Reporter + enabled: true + + # Source of Metrics, which will be used to identify each metric in database --> + # Commented to use the hostname by default + # source: Carbon + + # Alias referring to the Data Source configuration + dataSource: *JDBC01 + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and updating the database with the values + pollingPeriod: 60 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # Periodic Persistence Configuration +state.persistence: + enabled: true + intervalInMin: 1 + revisionsToKeep: 3 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.DBPersistenceStore + config: + datasource: WSO2_PERSISTENCE_DB + table: PERSISTENCE_TABLE + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + # Datasource Configurations +wso2.datasources: + dataSources: + - + definition: + configuration: + connectionTestQuery: "SELECT 1" + driverClassName: com.mysql.jdbc.Driver + idleTimeout: 60000 + isAutoCommit: false + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_CARBON_DB?useSSL=false' + maxPoolSize: 10 + password: wso2carbon + username: wso2carbon + validationTimeout: 30000 + type: RDBMS + description: "The datasource used for registry and user manager" + name: WSO2_CARBON_DB + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_METRICS_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_CLUSTER_DB + description: The MySQL datasource used for Cluster Coordination + jndiConfig: + name: jdbc/WSO2ClusterDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_CLUSTER_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERSISTENCE_DB + description: The MySQL datasource used for system persistence + jndiConfig: + name: jdbc/WSO2PersistenceDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_PERSISTENCE_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for permission feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + validationTimeout: 30000 + isAutoCommit: false + + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: GEO_LOCATION_DATA +# description: "The data source used for geo location database" +# jndiConfig: +# name: jdbc/GEO_LOCATION_DATA +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: APIM_ANALYTICS_DB +# description: "The datasource used for APIM statistics aggregated data." +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: WSO2AM_MGW_ANALYTICS_DB +# description: "The datasource used for APIM MGW analytics data." +# jndiConfig: +# name: jdbc/WSO2AM_MGW_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +siddhi: + extensions: + - + extension: + name: 'findCountryFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + - + extension: + name: 'findCityFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + + # Cluster Configuration +cluster.config: + enabled: true + groupId: ei.analytics + coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy + strategyConfig: + datasource: WSO2_CLUSTER_DB + heartbeatInterval: 1000 + heartbeatMaxRetry: 2 + eventPollingInterval: 1000 + +deployment.config: + type: ha + eventByteBufferQueueCapacity: 20000 + byteBufferExtractorThreadPoolSize: 5 + eventSyncServer: + host: ${NODE_IP} + port: 9894 + bossThreads: 10 + workerThreads: 10 + eventSyncClientPool: + maxActive: 10 + maxTotal: 10 + maxIdle: 10 + maxWait: 60000 + minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Two node HA +#deployment.config: +# type: ha +# eventSyncServer: +# host: localhost +# port: 9893 +# advertisedHost: localhost +# advertisedPort: 9893 +# bossThreads: 10 +# workerThreads: 10 +# eventSyncClientPool: +# maxActive: 10 +# maxTotal: 10 +# maxIdle: 10 +# maxWait: 60000 +# minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Distributed deployment +#deployment.config: +# type: distributed +# httpsInterface: +# host: 192.168.1.3 +# port: 9443 +# username: admin +# password: admin +# leaderRetryInterval: 10000 +# resourceManagers: +# - host: 192.168.1.1 +# port: 9543 +# username: admin +# password: admin +# - host: 192.168.1.2 +# port: 9543 +# username: admin +# password: admin diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json deleted file mode 100644 index bae5c064..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "store": { - "types": ["fs"] - }, - "gadgetGeneration" :{ - "isCreateGadgetEnable": false, - "ignoreProviders": ["rt"] - }, - "authentication": { - "activeMethod": "basic", - "methods": { - "sso": { - "attributes": { - "issuer": "portal", - "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": true, - "validateAssertionValidityPeriod": true, - "validateAudienceRestriction": true, - "assertionSigningEnabled": true, - "acs": "https://localhost:9444/portal/acs", - "identityAlias": "wso2carbon", - "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "grantType": "urn:ietf:params:oauth:grant-type:saml2-bearer", - "useTenantKey": false, - "isPassive": false - } - }, - "basic": { - "attributes": {} - } - } - }, - "authorization": { - "activeMethod": "", - "methods": { - "oauth": { - "attributes": { - "apimgt-gateway": false, - "oauthProvider": { - "appRegistration": { - "appType": "webapp", - "clientName": "portal", - "owner": "admin", - "password":"admin", - "dynamicClientAppRegistrationServiceURL": "%https.host%/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", - "tokenScope": "admin", - "callbackUrl": "%https.host%/portal", - "saasApp":true - }, - "tokenServiceURL": "%https.host%/oauth2/token" - }, - "adminUser":"admin@carbon.super", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "scopes" : [ - "device:view" - ] - } - } - } - }, - "designers": [ - "Internal/everyone" - ], - "tenantPrefix": "/t", - "shareStore": false, - "theme": "basic", - "cacheTimeoutSeconds": "5", - "cacheSizeBytes": "1073741824", - "defaultDashboardRedirect": false, - "isCreateGadgetEnable": true, - "isSecureVaultEnabled" : false, - "assets": { - "gadget": { - "fileSizeLimit": 5 - }, - "layout": { - "fileSizeLimit": 1 - } - }, - "oauth": { - "username": "admin", - "password": "admin" - }, - "host": { - "hostname": "localhost", - "port": "9444", - "protocol": "" - }, - "queryParameters" : { - "passBetweenPages" : ["shared"] - } -} diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat deleted file mode 100644 index 6e2734db..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat +++ /dev/null @@ -1 +0,0 @@ -wso2ei-analytics-2 diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf deleted file mode 100755 index 92fbc882..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf +++ /dev/null @@ -1,122 +0,0 @@ -# ------------------------------------------------------ -# CARBON RELATED SPARK PROPERTIES -# ------------------------------------------------------ -# Carbon specific properties when running Spark in the Carbon environment. -# Should start with the prefix "carbon." - -# carbon.spark.master config has 3 states -# 1. (default) local mode - spark starts in the local mode (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master local" or "carbon.spark.master local[2]" -# 2. client mode - DAS acts as a client for an external Spark cluster (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master spark://:" -# 3. cluster mode - DAS creates its own Spark cluster usign Carbon Clustering -# ex: "carbon.spark.master local" AND "carbon.spark.master.count " - -carbon.spark.master local -carbon.spark.master.count 2 - -#This configuration is used to limit the number of results returned from spark query execution -#To return all the results, set this to -1 -carbon.spark.results.limit 1000 - -# Below configuratoin can be used to point to a symbolic link to WSO2 DAS HOME -# carbon.das.symbolic.link /home/ubuntu/das/das_symlink/ - -# Below configuration can be used with the spark fair scheduler, when fair schedule pools are used. the -# defualt pool name for carbon is 'carbon-pool' -# carbon.scheduler.pool carbon-pool - - - -# ------------------------------------------------------ -# SPARK PROPERTIES -# ------------------------------------------------------ -# Default system properties included when running spark. -# This is useful for setting default environmental settings. -# Check http://spark.apache.org/docs/latest/configuration.html for further information - -# Application (Spark Driver) Properties -# ------------------------------------------------------ -spark.app.name CarbonAnalytics -# Spark Driver will be running inside the carbon JVM. Hence the below properties are obsolete -# spark.driver.cores 1 -# spark.driver.memory 512m - -# Runtime Environment -# ------------------------------------------------------ - -# Spark UI -spark.ui.port 4040 -spark.history.ui.port 18080 - -# Compression and Serialization -spark.serializer org.apache.spark.serializer.KryoSerializer -spark.kryoserializer.buffer 256k -spark.kryoserializer.buffer.max 256m - -# Execution Behavior - -# Networking -spark.blockManager.port 12000 -spark.broadcast.port 12500 -spark.driver.port 13000 -spark.executor.port 13500 -spark.fileserver.port 14000 -spark.replClassServer.port 14500 -spark.akka.timeout 1000s - -# Scheduling -spark.scheduler.mode FAIR -# this property can be set to specify where hte fairscheduler.xml file is. the carbon specific -# fairscheduler.xml is in the /repository/conf/analytics/spark directory -# spark.scheduler.allocation.file /repository/conf/analytics/spark/fairscheduler.xml - -# Dynamic Allocation - -# Security - -# Encryption - -# Standalone Cluster Configs -spark.deploy.recoveryMode CUSTOM -spark.deploy.recoveryMode.factory org.wso2.carbon.analytics.spark.core.deploy.AnalyticsRecoveryModeFactory - -# Master -spark.master.port 7077 -spark.master.rest.port 6066 -spark.master.webui.port 8081 - -# Worker -spark.worker.cores 1 -spark.worker.memory 1g -spark.worker.dir work -spark.worker.port 11000 -spark.worker.webui.port 11500 - -# Executors -# spark.executor.cores 1 ; Default: Takes all the available cores in the worker -spark.executor.memory 1g -spark.executor.logs.rolling.strategy size -spark.executor.logs.rolling.maxSize 10000000 -spark.executor.logs.rolling.maxRetainedFiles 10 - -# spark.cores.max ; Default: Int.MAX_VALUE; The maximum amount of CPU cores to request for the application from across -# the cluster (not from each machine) - - -# Spark Logging -# ------------------------------------------------------ -# To allow event logging for spark you need to uncomment -# the line spark.eventlog.log true and set the directory in which the -# logs will be stored. - -# spark.eventLog.enabled true -# spark.eventLog.dir - -# YARN related configs -# ------------------------------------------------------ -# spark.yarn.jar - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml deleted file mode 100644 index 1bdea04e..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml +++ /dev/null @@ -1,719 +0,0 @@ - - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Enterprise Integrator-6.3.0 - - - WSO2 Enterprise Integrator-6.3.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - kubernetes - - - - - wso2.ei.analytics.domain - - - - - - 45564 - - 100 - - 60 - - - - - - ei-analytics-2 - - - - - - 4000 - - - - - - - - - - - org.wso2.carbon.membership.scheme.kubernetes.KubernetesMembershipScheme - wso2 - integrator-with-analytics-ei-analytics-1-service,integrator-with-analytics-ei-analytics-2-service - true - false - - - - - - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/carbon.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/carbon.xml deleted file mode 100644 index 0a155002..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/carbon.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - WSO2 Enterprise Integrator Analytics - - - EI - - - 6.0.0 - - - wso2ei-analytics - - - wso2ei-analytics - - - local:/${carbon.context}/services/ - - - - - - - DataAnalyticsServer - ComplexEventProcessor - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 1 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 153722867280912 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - true - allow - - - - - - - - - - - false - - (.*)(/images|/css|/js|/docs)(.*) - - - - - - - true - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://product-dist.wso2.com/p2/carbon/releases/wilkes/ - - - - - - - - true - - - - - - true - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml deleted file mode 100644 index 9019ef87..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - - - WSO2_ANALYTICS_EVENT_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_ANALYTICS_EVENT_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - - - - - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml deleted file mode 100644 index a0466472..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - WSO2_CARBON_DB - The datasource used for registry and user manager - - jdbc/WSO2CarbonDB - - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_CONFIG_DB - The datasource used for config registry - - jdbc/WSO2ConfigDB - - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2EI_INTEGRATOR_CONFIG_GOV_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 80 - 60000 - true - SELECT 1 - 30000 - - - - - WSO2_USER_DB - The datasource is used for user mangement and userstore - - jdbc/WSO2UserDB - - - - jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2EI_USER_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - - - - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/event-processor.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/event-processor.xml deleted file mode 100644 index 1d13b213..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/event-processor.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - 10000 - - integrator-with-analytics-ei-analytics - 11224 - 20000 - 20000 - - 5242880 - - UTF-8 - 1024 - 30000 - - 1000000 - - 10 - - 1000000 - - 10 - - - integrator-with-analytics-ei-analytics - 10005 - 15000 - 10000 - - - integrator-with-analytics-ei-analytics - 11000 - - 5242880 - - UTF-8 - 1024 - 30000 - - - 15 - 10 - - cep_persistence - - - - - - - - - - - 0.0.0.0 - 8904 - - - 0.0.0.0 - 11000 - - - - - - - localhost - 8904 - - - localhost - 8905 - - - - 20000 - - 5000 - - 10000 - - - - - - 15000 - 15100 - - - 20000 - - 8192 - - 8192 - - 5242880 - - UTF-8 - - 10000 - - 20000 - - - - 1024 - - 5242880 - - UTF-8 - - 20000 - - - - 60000 - 60000 - - - org.wso2.cep.storm.dependencies.jar - - - - 20000 - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/registry.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/registry.xml deleted file mode 100644 index 61068d93..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/registry.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - jdbc/WSO2ConfigDB - - - wso2config - wso2config - false - / - - - wso2config - /_system/config/ei_analytics - - - wso2config - /_system/governance/ei_analytics - - - - - - - - - - - - - 35 - 3 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml deleted file mode 100644 index 801f8cac..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - true - jdbc/WSO2UserDB - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - true - true - ^[\S]{3,30}$ - ^[\S]{3,30}$ - Username pattern policy violated - ^[\S]{5,30}$ - ^[\S]{5,30}$ - Password length should be within 5 to 30 characters - ^[\S]{3,30}$ - ^[\S]{3,30}$ - true - false - true - SHA-256 - true - , - 100 - 100 - true - false - - - - - - - - - - - - - /permission - true - false - - - - - diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml new file mode 100644 index 00000000..63765809 --- /dev/null +++ b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml @@ -0,0 +1,632 @@ +################################################################################ +# Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: ${NODE_IP} + # server name + name: WSO2 EI integrator Analytics + # dashboard type + # ports used by this server + ports: + # port offset + offset: 0 + type: wso2-ei-analytics + +wso2.transport.http: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 9091 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 9444 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + senderConfigurations: + - + id: "http-sender" + +siddhi.stores.query.api: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 7070 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 7443 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7612' + sslPort: '7712' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: 0.0.0.0 + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + +# This is the main configuration for metrics +wso2.metrics: + # Enable Metrics + enabled: false + reporting: + console: + - # The name for the Console Reporter + name: Console + + # Enable Console Reporter + enabled: false + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and printing in the console + pollingPeriod: 5 + +wso2.metrics.jdbc: + # Data Source Configurations for JDBC Reporters + dataSource: + # Default Data Source Configuration + - &JDBC01 + # JNDI name of the data source to be used by the JDBC Reporter. + # This data source should be defined in a *-datasources.xml file in conf/datasources directory. + dataSourceName: java:comp/env/jdbc/WSO2MetricsDB + # Schedule regular deletion of metrics data older than a set number of days. + # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. + # Deleting data older than seven days should be sufficient. + scheduledCleanup: + # Enable scheduled cleanup to delete Metrics data in the database. + enabled: true + + # The scheduled job will cleanup all data older than the specified days + daysToKeep: 7 + + # This is the period for each cleanup operation in seconds. + scheduledCleanupPeriod: 86400 + + # The JDBC Reporter is in the Metrics JDBC Core feature + reporting: + # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime + jdbc: + - # The name for the JDBC Reporter + name: JDBC + + # Enable JDBC Reporter + enabled: true + + # Source of Metrics, which will be used to identify each metric in database --> + # Commented to use the hostname by default + # source: Carbon + + # Alias referring to the Data Source configuration + dataSource: *JDBC01 + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and updating the database with the values + pollingPeriod: 60 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # Periodic Persistence Configuration +state.persistence: + enabled: true + intervalInMin: 1 + revisionsToKeep: 3 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.DBPersistenceStore + config: + datasource: WSO2_PERSISTENCE_DB + table: PERSISTENCE_TABLE + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + # Datasource Configurations +wso2.datasources: + dataSources: + - + definition: + configuration: + connectionTestQuery: "SELECT 1" + driverClassName: com.mysql.jdbc.Driver + idleTimeout: 60000 + isAutoCommit: false + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_CARBON_DB?useSSL=false' + maxPoolSize: 10 + password: wso2carbon + username: wso2carbon + validationTimeout: 30000 + type: RDBMS + description: "The datasource used for registry and user manager" + name: WSO2_CARBON_DB + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_METRICS_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_CLUSTER_DB + description: The MySQL datasource used for Cluster Coordination + jndiConfig: + name: jdbc/WSO2ClusterDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_CLUSTER_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERSISTENCE_DB + description: The MySQL datasource used for system persistence + jndiConfig: + name: jdbc/WSO2PersistenceDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/WSO2_PERSISTENCE_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for permission feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + validationTimeout: 30000 + isAutoCommit: false + + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: GEO_LOCATION_DATA +# description: "The data source used for geo location database" +# jndiConfig: +# name: jdbc/GEO_LOCATION_DATA +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: APIM_ANALYTICS_DB +# description: "The datasource used for APIM statistics aggregated data." +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: WSO2AM_MGW_ANALYTICS_DB +# description: "The datasource used for APIM MGW analytics data." +# jndiConfig: +# name: jdbc/WSO2AM_MGW_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +siddhi: + extensions: + - + extension: + name: 'findCountryFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + - + extension: + name: 'findCityFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + + # Cluster Configuration +cluster.config: + enabled: true + groupId: ei.analytics + coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy + strategyConfig: + datasource: WSO2_CLUSTER_DB + heartbeatInterval: 1000 + heartbeatMaxRetry: 2 + eventPollingInterval: 1000 + +deployment.config: + type: ha + eventByteBufferQueueCapacity: 20000 + byteBufferExtractorThreadPoolSize: 5 + eventSyncServer: + host: ${NODE_IP} + port: 9894 + bossThreads: 10 + workerThreads: 10 + eventSyncClientPool: + maxActive: 10 + maxTotal: 10 + maxIdle: 10 + maxWait: 60000 + minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Two node HA +#deployment.config: +# type: ha +# eventSyncServer: +# host: localhost +# port: 9893 +# advertisedHost: localhost +# advertisedPort: 9893 +# bossThreads: 10 +# workerThreads: 10 +# eventSyncClientPool: +# maxActive: 10 +# maxTotal: 10 +# maxIdle: 10 +# maxWait: 60000 +# minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Distributed deployment +#deployment.config: +# type: distributed +# httpsInterface: +# host: 192.168.1.3 +# port: 9443 +# username: admin +# password: admin +# leaderRetryInterval: 10000 +# resourceManagers: +# - host: 192.168.1.1 +# port: 9543 +# username: admin +# password: admin +# - host: 192.168.1.2 +# port: 9543 +# username: admin +# password: admin diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json deleted file mode 100644 index bae5c064..00000000 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "store": { - "types": ["fs"] - }, - "gadgetGeneration" :{ - "isCreateGadgetEnable": false, - "ignoreProviders": ["rt"] - }, - "authentication": { - "activeMethod": "basic", - "methods": { - "sso": { - "attributes": { - "issuer": "portal", - "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": true, - "validateAssertionValidityPeriod": true, - "validateAudienceRestriction": true, - "assertionSigningEnabled": true, - "acs": "https://localhost:9444/portal/acs", - "identityAlias": "wso2carbon", - "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "grantType": "urn:ietf:params:oauth:grant-type:saml2-bearer", - "useTenantKey": false, - "isPassive": false - } - }, - "basic": { - "attributes": {} - } - } - }, - "authorization": { - "activeMethod": "", - "methods": { - "oauth": { - "attributes": { - "apimgt-gateway": false, - "oauthProvider": { - "appRegistration": { - "appType": "webapp", - "clientName": "portal", - "owner": "admin", - "password":"admin", - "dynamicClientAppRegistrationServiceURL": "%https.host%/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", - "tokenScope": "admin", - "callbackUrl": "%https.host%/portal", - "saasApp":true - }, - "tokenServiceURL": "%https.host%/oauth2/token" - }, - "adminUser":"admin@carbon.super", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "scopes" : [ - "device:view" - ] - } - } - } - }, - "designers": [ - "Internal/everyone" - ], - "tenantPrefix": "/t", - "shareStore": false, - "theme": "basic", - "cacheTimeoutSeconds": "5", - "cacheSizeBytes": "1073741824", - "defaultDashboardRedirect": false, - "isCreateGadgetEnable": true, - "isSecureVaultEnabled" : false, - "assets": { - "gadget": { - "fileSizeLimit": 5 - }, - "layout": { - "fileSizeLimit": 1 - } - }, - "oauth": { - "username": "admin", - "password": "admin" - }, - "host": { - "hostname": "localhost", - "port": "9444", - "protocol": "" - }, - "queryParameters" : { - "passBetweenPages" : ["shared"] - } -} diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-dashboard/conf/dashboard/deployment.yaml b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-dashboard/conf/dashboard/deployment.yaml new file mode 100644 index 00000000..edb9c663 --- /dev/null +++ b/helm/integrator-with-analytics/integrator-with-analytics/confs/ei-analytics-dashboard/conf/dashboard/deployment.yaml @@ -0,0 +1,466 @@ +################################################################################ +# Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: wso2-sp + # server name + name: WSO2 Stream Processor + # ports used by this server + ports: + # port offset + offset: 2 + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7611' + sslPort: '7711' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: 0.0.0.0 + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # HA Configuration +state.persistence: + enabled: false + intervalInMin: 1 + revisionsToKeep: 2 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.FileSystemPersistenceStore + config: + location: siddhi-app-persistence + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + +# Data Sources Configuration +wso2.datasources: + dataSources: + # Dashboard data source + - name: WSO2_DASHBOARD_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/DASHBOARD_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/DASHBOARD_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 20 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + - name: BUSINESS_RULES_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/BUSINESS_RULES_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/BUSINESS_RULES_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 20 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: SAMPLE_DB +# description: Sample datasource used for gadgets generation wizard +# jndiConfig: +# name: jdbc/SAMPLE_DB +# useJndiReference: true +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/SAMPLE_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 10 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + # Dashboard data source + - name: WSO2_STATUS_DASHBOARD_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/wso2_status_dashboard + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/wso2_status_dashboard;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 20 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/metrics;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 20 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-with-analytics-rdbms-service-mysql:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + #Data source for APIM Analytics +# - name: APIM_ANALYTICS_DB +# description: Datasource used for APIM Analytics +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + +wso2.business.rules.manager: + datasource: BUSINESS_RULES_DB + # rule template wise configuration for deploying business rules + deployment_configs: + - + # : of the Worker node + localhost:9443: + # UUIDs of rule templates that are needed to be deployed on the node + - stock-data-analysis + - stock-exchange-input + - stock-exchange-output + - identifying-continuous-production-decrease + - popular-tweets-analysis + - http-analytics-processing + - message-tracing-source-template + - message-tracing-app-template + # credentials for worker nodes + username: admin + password: admin + +wso2.status.dashboard: + pollingInterval: 5 + metricsDatasourceName: 'WSO2_METRICS_DB' + dashboardDatasourceName: 'WSO2_STATUS_DASHBOARD_DB' + workerAccessCredentials: + username: 'admin' + password: 'admin' + +wso2.transport.http: + transportProperties: + - name: "server.bootstrap.socket.timeout" + value: 60 + - name: "client.bootstrap.socket.timeout" + value: 60 + - name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - id: "default-https" + host: "0.0.0.0" + port: 9643 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/axis2/axis2.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/axis2/axis2.xml index b0a8bca5..1be24a92 100644 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/axis2/axis2.xml +++ b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/axis2/axis2.xml @@ -62,8 +62,8 @@ axis2modules - WSO2 EI 6.3.0 - WSO2 EI 6.3.0 + WSO2 EI 6.4.0 + WSO2 EI 6.4.0 diff --git a/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/carbon.xml b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/carbon.xml index d81f458a..707c20f9 100644 --- a/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/carbon.xml +++ b/helm/integrator-with-analytics/integrator-with-analytics/confs/integrator/conf/carbon.xml @@ -36,7 +36,7 @@ - 6.3.0 + 6.4.0 - + + + + + + true + + + org.wso2.carbon.crypto.provider.KeyStoreBasedInternalCryptoProvider + + + org.wso2.carbon.core.encryption.KeyStoreBasedExternalCryptoProvider + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + axis2modules - WSO2 EI 6.3.0 - Broker - WSO2 EI 6.3.0 - Broker + WSO2 EI 6.4.0 - Broker + WSO2 EI 6.4.0 - Broker diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/broker.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/broker.xml index bf5a1da1..74141931 100644 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/broker.xml +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/broker/broker.xml @@ -89,6 +89,12 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c wso2carbon SunX509 + + TLSv1 + + 10 @@ -264,6 +270,10 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c 20 + + + 30 - + + + + + + true + + + org.wso2.carbon.crypto.provider.KeyStoreBasedInternalCryptoProvider + + + org.wso2.carbon.core.encryption.KeyStoreBasedExternalCryptoProvider + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Enterprise Integrator-6.3.0 - - - WSO2 Enterprise Integrator-6.3.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - kubernetes - - - - - wso2.ei.analytics.domain - - - - - - 45564 - - 100 - - 60 - - - - - - ei-analytics-1 - - - - - - 4000 - - - - - - - - - - - org.wso2.carbon.membership.scheme.kubernetes.KubernetesMembershipScheme - wso2 - wso2ei-analytics-1-service,wso2ei-analytics-2-service - true - false - - - - - - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/carbon.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/carbon.xml deleted file mode 100644 index 0a155002..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/carbon.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - WSO2 Enterprise Integrator Analytics - - - EI - - - 6.0.0 - - - wso2ei-analytics - - - wso2ei-analytics - - - local:/${carbon.context}/services/ - - - - - - - DataAnalyticsServer - ComplexEventProcessor - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 1 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 153722867280912 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - true - allow - - - - - - - - - - - false - - (.*)(/images|/css|/js|/docs)(.*) - - - - - - - true - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://product-dist.wso2.com/p2/carbon/releases/wilkes/ - - - - - - - - true - - - - - - true - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml deleted file mode 100644 index 71f0d357..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/analytics-datasources.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - - - WSO2_ANALYTICS_EVENT_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_ANALYTICS_EVENT_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - - - - - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml deleted file mode 100644 index 7f5b5809..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - WSO2_CARBON_DB - The datasource used for registry and user manager - - jdbc/WSO2CarbonDB - - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_CONFIG_DB - The datasource used for config registry - - jdbc/WSO2ConfigDB - - - - jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2EI_INTEGRATOR_CONFIG_GOV_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 80 - 60000 - true - SELECT 1 - 30000 - - - - - WSO2_USER_DB - The datasource is used for user mangement and userstore - - jdbc/WSO2UserDB - - - - jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2EI_USER_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - - - - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/event-processor.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/event-processor.xml deleted file mode 100644 index 1d13b213..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/event-processor.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - 10000 - - integrator-with-analytics-ei-analytics - 11224 - 20000 - 20000 - - 5242880 - - UTF-8 - 1024 - 30000 - - 1000000 - - 10 - - 1000000 - - 10 - - - integrator-with-analytics-ei-analytics - 10005 - 15000 - 10000 - - - integrator-with-analytics-ei-analytics - 11000 - - 5242880 - - UTF-8 - 1024 - 30000 - - - 15 - 10 - - cep_persistence - - - - - - - - - - - 0.0.0.0 - 8904 - - - 0.0.0.0 - 11000 - - - - - - - localhost - 8904 - - - localhost - 8905 - - - - 20000 - - 5000 - - 10000 - - - - - - 15000 - 15100 - - - 20000 - - 8192 - - 8192 - - 5242880 - - UTF-8 - - 10000 - - 20000 - - - - 1024 - - 5242880 - - UTF-8 - - 20000 - - - - 60000 - 60000 - - - org.wso2.cep.storm.dependencies.jar - - - - 20000 - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/registry.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/registry.xml deleted file mode 100644 index 61068d93..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/registry.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - jdbc/WSO2ConfigDB - - - wso2config - wso2config - false - / - - - wso2config - /_system/config/ei_analytics - - - wso2config - /_system/governance/ei_analytics - - - - - - - - - - - - - 35 - 3 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml deleted file mode 100644 index 801f8cac..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/user-mgt.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - true - jdbc/WSO2UserDB - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - true - true - ^[\S]{3,30}$ - ^[\S]{3,30}$ - Username pattern policy violated - ^[\S]{5,30}$ - ^[\S]{5,30}$ - Password length should be within 5 to 30 characters - ^[\S]{3,30}$ - ^[\S]{3,30}$ - true - false - true - SHA-256 - true - , - 100 - 100 - true - false - - - - - - - - - - - - - /permission - true - false - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml new file mode 100644 index 00000000..a2023a15 --- /dev/null +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/conf/worker/deployment.yaml @@ -0,0 +1,632 @@ +################################################################################ +# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: ${NODE_IP} + # server name + name: WSO2 EI integrator Analytics + # dashboard type + # ports used by this server + ports: + # port offset + offset: 0 + type: wso2-ei-analytics + +wso2.transport.http: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 9091 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 9444 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + senderConfigurations: + - + id: "http-sender" + +siddhi.stores.query.api: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 7070 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 7443 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7612' + sslPort: '7712' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: 0.0.0.0 + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + +# This is the main configuration for metrics +wso2.metrics: + # Enable Metrics + enabled: true + reporting: + console: + - # The name for the Console Reporter + name: Console + + # Enable Console Reporter + enabled: false + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and printing in the console + pollingPeriod: 5 + +wso2.metrics.jdbc: + # Data Source Configurations for JDBC Reporters + dataSource: + # Default Data Source Configuration + - &JDBC01 + # JNDI name of the data source to be used by the JDBC Reporter. + # This data source should be defined in a *-datasources.xml file in conf/datasources directory. + dataSourceName: java:comp/env/jdbc/WSO2MetricsDB + # Schedule regular deletion of metrics data older than a set number of days. + # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. + # Deleting data older than seven days should be sufficient. + scheduledCleanup: + # Enable scheduled cleanup to delete Metrics data in the database. + enabled: true + + # The scheduled job will cleanup all data older than the specified days + daysToKeep: 7 + + # This is the period for each cleanup operation in seconds. + scheduledCleanupPeriod: 86400 + + # The JDBC Reporter is in the Metrics JDBC Core feature + reporting: + # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime + jdbc: + - # The name for the JDBC Reporter + name: JDBC + + # Enable JDBC Reporter + enabled: true + + # Source of Metrics, which will be used to identify each metric in database --> + # Commented to use the hostname by default + # source: Carbon + + # Alias referring to the Data Source configuration + dataSource: *JDBC01 + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and updating the database with the values + pollingPeriod: 60 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # Periodic Persistence Configuration +state.persistence: + enabled: true + intervalInMin: 1 + revisionsToKeep: 3 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.DBPersistenceStore + config: + datasource: WSO2_PERSISTENCE_DB + table: PERSISTENCE_TABLE + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + # Datasource Configurations +wso2.datasources: + dataSources: + - + definition: + configuration: + connectionTestQuery: "SELECT 1" + driverClassName: com.mysql.jdbc.Driver + idleTimeout: 60000 + isAutoCommit: false + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_CARBON_DB?useSSL=false' + maxPoolSize: 10 + password: wso2carbon + username: wso2carbon + validationTimeout: 30000 + type: RDBMS + description: "The datasource used for registry and user manager" + name: WSO2_CARBON_DB + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_METRICS_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_CLUSTER_DB + description: The MySQL datasource used for Cluster Coordination + jndiConfig: + name: jdbc/WSO2ClusterDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_CLUSTER_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERSISTENCE_DB + description: The MySQL datasource used for system persistence + jndiConfig: + name: jdbc/WSO2PersistenceDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_PERSISTENCE_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for permission feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + validationTimeout: 30000 + isAutoCommit: false + + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: GEO_LOCATION_DATA +# description: "The data source used for geo location database" +# jndiConfig: +# name: jdbc/GEO_LOCATION_DATA +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: APIM_ANALYTICS_DB +# description: "The datasource used for APIM statistics aggregated data." +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: WSO2AM_MGW_ANALYTICS_DB +# description: "The datasource used for APIM MGW analytics data." +# jndiConfig: +# name: jdbc/WSO2AM_MGW_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +siddhi: + extensions: + - + extension: + name: 'findCountryFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + - + extension: + name: 'findCityFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + + # Cluster Configuration +cluster.config: + enabled: true + groupId: ei.analytics + coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy + strategyConfig: + datasource: WSO2_CLUSTER_DB + heartbeatInterval: 1000 + heartbeatMaxRetry: 2 + eventPollingInterval: 1000 + +deployment.config: + type: ha + eventByteBufferQueueCapacity: 20000 + byteBufferExtractorThreadPoolSize: 5 + eventSyncServer: + host: ${NODE_IP} + port: 9894 + bossThreads: 10 + workerThreads: 10 + eventSyncClientPool: + maxActive: 10 + maxTotal: 10 + maxIdle: 10 + maxWait: 60000 + minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Two node HA +#deployment.config: +# type: ha +# eventSyncServer: +# host: localhost +# port: 9893 +# advertisedHost: localhost +# advertisedPort: 9893 +# bossThreads: 10 +# workerThreads: 10 +# eventSyncClientPool: +# maxActive: 10 +# maxTotal: 10 +# maxIdle: 10 +# maxWait: 60000 +# minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Distributed deployment +#deployment.config: +# type: distributed +# httpsInterface: +# host: 192.168.1.3 +# port: 9443 +# username: admin +# password: admin +# leaderRetryInterval: 10000 +# resourceManagers: +# - host: 192.168.1.1 +# port: 9543 +# username: admin +# password: admin +# - host: 192.168.1.2 +# port: 9543 +# username: admin +# password: admin diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json deleted file mode 100644 index bae5c064..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-1/repository/deployment/server/jaggeryapps/portal/configs/designer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "store": { - "types": ["fs"] - }, - "gadgetGeneration" :{ - "isCreateGadgetEnable": false, - "ignoreProviders": ["rt"] - }, - "authentication": { - "activeMethod": "basic", - "methods": { - "sso": { - "attributes": { - "issuer": "portal", - "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": true, - "validateAssertionValidityPeriod": true, - "validateAudienceRestriction": true, - "assertionSigningEnabled": true, - "acs": "https://localhost:9444/portal/acs", - "identityAlias": "wso2carbon", - "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "grantType": "urn:ietf:params:oauth:grant-type:saml2-bearer", - "useTenantKey": false, - "isPassive": false - } - }, - "basic": { - "attributes": {} - } - } - }, - "authorization": { - "activeMethod": "", - "methods": { - "oauth": { - "attributes": { - "apimgt-gateway": false, - "oauthProvider": { - "appRegistration": { - "appType": "webapp", - "clientName": "portal", - "owner": "admin", - "password":"admin", - "dynamicClientAppRegistrationServiceURL": "%https.host%/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", - "tokenScope": "admin", - "callbackUrl": "%https.host%/portal", - "saasApp":true - }, - "tokenServiceURL": "%https.host%/oauth2/token" - }, - "adminUser":"admin@carbon.super", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "scopes" : [ - "device:view" - ] - } - } - } - }, - "designers": [ - "Internal/everyone" - ], - "tenantPrefix": "/t", - "shareStore": false, - "theme": "basic", - "cacheTimeoutSeconds": "5", - "cacheSizeBytes": "1073741824", - "defaultDashboardRedirect": false, - "isCreateGadgetEnable": true, - "isSecureVaultEnabled" : false, - "assets": { - "gadget": { - "fileSizeLimit": 5 - }, - "layout": { - "fileSizeLimit": 1 - } - }, - "oauth": { - "username": "admin", - "password": "admin" - }, - "host": { - "hostname": "localhost", - "port": "9444", - "protocol": "" - }, - "queryParameters" : { - "passBetweenPages" : ["shared"] - } -} diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat deleted file mode 100644 index 6e2734db..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/my-node-id.dat +++ /dev/null @@ -1 +0,0 @@ -wso2ei-analytics-2 diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf deleted file mode 100755 index 92fbc882..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/analytics/spark/spark-defaults.conf +++ /dev/null @@ -1,122 +0,0 @@ -# ------------------------------------------------------ -# CARBON RELATED SPARK PROPERTIES -# ------------------------------------------------------ -# Carbon specific properties when running Spark in the Carbon environment. -# Should start with the prefix "carbon." - -# carbon.spark.master config has 3 states -# 1. (default) local mode - spark starts in the local mode (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master local" or "carbon.spark.master local[2]" -# 2. client mode - DAS acts as a client for an external Spark cluster (NOTE: carbon.spark.master.count property -# will not be considered here) -# ex: "carbon.spark.master spark://:" -# 3. cluster mode - DAS creates its own Spark cluster usign Carbon Clustering -# ex: "carbon.spark.master local" AND "carbon.spark.master.count " - -carbon.spark.master local -carbon.spark.master.count 2 - -#This configuration is used to limit the number of results returned from spark query execution -#To return all the results, set this to -1 -carbon.spark.results.limit 1000 - -# Below configuratoin can be used to point to a symbolic link to WSO2 DAS HOME -# carbon.das.symbolic.link /home/ubuntu/das/das_symlink/ - -# Below configuration can be used with the spark fair scheduler, when fair schedule pools are used. the -# defualt pool name for carbon is 'carbon-pool' -# carbon.scheduler.pool carbon-pool - - - -# ------------------------------------------------------ -# SPARK PROPERTIES -# ------------------------------------------------------ -# Default system properties included when running spark. -# This is useful for setting default environmental settings. -# Check http://spark.apache.org/docs/latest/configuration.html for further information - -# Application (Spark Driver) Properties -# ------------------------------------------------------ -spark.app.name CarbonAnalytics -# Spark Driver will be running inside the carbon JVM. Hence the below properties are obsolete -# spark.driver.cores 1 -# spark.driver.memory 512m - -# Runtime Environment -# ------------------------------------------------------ - -# Spark UI -spark.ui.port 4040 -spark.history.ui.port 18080 - -# Compression and Serialization -spark.serializer org.apache.spark.serializer.KryoSerializer -spark.kryoserializer.buffer 256k -spark.kryoserializer.buffer.max 256m - -# Execution Behavior - -# Networking -spark.blockManager.port 12000 -spark.broadcast.port 12500 -spark.driver.port 13000 -spark.executor.port 13500 -spark.fileserver.port 14000 -spark.replClassServer.port 14500 -spark.akka.timeout 1000s - -# Scheduling -spark.scheduler.mode FAIR -# this property can be set to specify where hte fairscheduler.xml file is. the carbon specific -# fairscheduler.xml is in the /repository/conf/analytics/spark directory -# spark.scheduler.allocation.file /repository/conf/analytics/spark/fairscheduler.xml - -# Dynamic Allocation - -# Security - -# Encryption - -# Standalone Cluster Configs -spark.deploy.recoveryMode CUSTOM -spark.deploy.recoveryMode.factory org.wso2.carbon.analytics.spark.core.deploy.AnalyticsRecoveryModeFactory - -# Master -spark.master.port 7077 -spark.master.rest.port 6066 -spark.master.webui.port 8081 - -# Worker -spark.worker.cores 1 -spark.worker.memory 1g -spark.worker.dir work -spark.worker.port 11000 -spark.worker.webui.port 11500 - -# Executors -# spark.executor.cores 1 ; Default: Takes all the available cores in the worker -spark.executor.memory 1g -spark.executor.logs.rolling.strategy size -spark.executor.logs.rolling.maxSize 10000000 -spark.executor.logs.rolling.maxRetainedFiles 10 - -# spark.cores.max ; Default: Int.MAX_VALUE; The maximum amount of CPU cores to request for the application from across -# the cluster (not from each machine) - - -# Spark Logging -# ------------------------------------------------------ -# To allow event logging for spark you need to uncomment -# the line spark.eventlog.log true and set the directory in which the -# logs will be stored. - -# spark.eventLog.enabled true -# spark.eventLog.dir - -# YARN related configs -# ------------------------------------------------------ -# spark.yarn.jar - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml deleted file mode 100644 index 648693f2..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/axis2/axis2.xml +++ /dev/null @@ -1,719 +0,0 @@ - - - - - - - - - - - - - ${hotdeployment} - ${hotupdate} - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Enterprise Integrator-6.3.0 - - - WSO2 Enterprise Integrator-6.3.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - kubernetes - - - - - wso2.ei.analytics.domain - - - - - - 45564 - - 100 - - 60 - - - - - - ei-analytics-2 - - - - - - 4000 - - - - - - - - - - - org.wso2.carbon.membership.scheme.kubernetes.KubernetesMembershipScheme - wso2 - wso2ei-analytics-1-service,wso2ei-analytics-2-service - true - false - - - - - - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/carbon.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/carbon.xml deleted file mode 100644 index 0a155002..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/carbon.xml +++ /dev/null @@ -1,695 +0,0 @@ - - - - - - - - WSO2 Enterprise Integrator Analytics - - - EI - - - 6.0.0 - - - wso2ei-analytics - - - wso2ei-analytics - - - local:/${carbon.context}/services/ - - - - - - - DataAnalyticsServer - ComplexEventProcessor - - - - - - - org.wso2.carbon - - - / - - - - - - - - - 15 - - - - - - - - - 1 - - - - - 9999 - - 11111 - - - - - - 10389 - - 8000 - - - - - - 10500 - - - - - - - - - org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory - - - - - - - - - java - - - - - - - - - - false - - - false - - - 600 - - - - false - - - - - - - - 153722867280912 - - - - - - - - - 15 - - - - - - ${carbon.home}/repository/deployment/server/ - - - 15 - - - ${carbon.home}/conf/axis2/axis2.xml - - - 30000 - - - ${carbon.home}/repository/deployment/client/ - - ${carbon.home}/conf/axis2/axis2_client.xml - - true - - - - - - - - - - admin - Default Administrator Role - - - user - Default User Role - - - - - - - - - - - - ${carbon.home}/repository/resources/security/wso2carbon.jks - - JKS - - wso2carbon - - wso2carbon - - wso2carbon - - - - - - ${carbon.home}/repository/resources/security/client-truststore.jks - - JKS - - wso2carbon - - - - - - - - - - - - - - - - - - - UserManager - - - false - - - - - - true - allow - - - - - - - - - - - false - - (.*)(/images|/css|/js|/docs)(.*) - - - - - - - true - - - - - ${carbon.home}/tmp/work - - - - - - true - - - 10 - - - 30 - - - - - - 100 - - - - keystore - certificate - * - - org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor - - - - - jarZip - - org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor - - - - dbs - - org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor - - - - tools - - org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor - - - - toolsAny - - org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor - - - - - - - - - - info - org.wso2.carbon.core.transports.util.InfoProcessor - - - wsdl - org.wso2.carbon.core.transports.util.Wsdl11Processor - - - wsdl2 - org.wso2.carbon.core.transports.util.Wsdl20Processor - - - xsd - org.wso2.carbon.core.transports.util.XsdProcessor - - - - - - false - false - true - svn - http://svnrepo.example.com/repos/ - username - password - true - - - - - - - - - - - - - - - ${require.carbon.servlet} - - - - - true - - - - - - - default repository - http://product-dist.wso2.com/p2/carbon/releases/wilkes/ - - - - - - - - true - - - - - - true - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml deleted file mode 100644 index 71f0d357..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/analytics-datasources.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - - - WSO2_ANALYTICS_EVENT_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_ANALYTICS_EVENT_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB - The datasource used for analytics record store - - - jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - SELECT 1 - false - 0 - true - 4000 - READ_COMMITTED - - - - - - - - - - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml deleted file mode 100644 index 7f5b5809..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/datasources/master-datasources.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader - - - - - - WSO2_CARBON_DB - The datasource used for registry and user manager - - jdbc/WSO2CarbonDB - - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_CONFIG_DB - The datasource used for config registry - - jdbc/WSO2ConfigDB - - - - jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2EI_INTEGRATOR_CONFIG_GOV_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 80 - 60000 - true - SELECT 1 - 30000 - - - - - WSO2_USER_DB - The datasource is used for user mangement and userstore - - jdbc/WSO2UserDB - - - - jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2EI_USER_DB?autoReconnect=true&useSSL=false - wso2carbon - wso2carbon - com.mysql.jdbc.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - - - - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/event-processor.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/event-processor.xml deleted file mode 100644 index 1d13b213..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/event-processor.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - 10000 - - integrator-with-analytics-ei-analytics - 11224 - 20000 - 20000 - - 5242880 - - UTF-8 - 1024 - 30000 - - 1000000 - - 10 - - 1000000 - - 10 - - - integrator-with-analytics-ei-analytics - 10005 - 15000 - 10000 - - - integrator-with-analytics-ei-analytics - 11000 - - 5242880 - - UTF-8 - 1024 - 30000 - - - 15 - 10 - - cep_persistence - - - - - - - - - - - 0.0.0.0 - 8904 - - - 0.0.0.0 - 11000 - - - - - - - localhost - 8904 - - - localhost - 8905 - - - - 20000 - - 5000 - - 10000 - - - - - - 15000 - 15100 - - - 20000 - - 8192 - - 8192 - - 5242880 - - UTF-8 - - 10000 - - 20000 - - - - 1024 - - 5242880 - - UTF-8 - - 20000 - - - - 60000 - 60000 - - - org.wso2.cep.storm.dependencies.jar - - - - 20000 - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/registry.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/registry.xml deleted file mode 100644 index 61068d93..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/registry.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc/WSO2CarbonDB - - - - - jdbc/WSO2ConfigDB - - - wso2config - wso2config - false - / - - - wso2config - /_system/config/ei_analytics - - - wso2config - /_system/governance/ei_analytics - - - - - - - - - - - - - 35 - 3 - - 50 - - 50 - - /_system/local/repository/components/org.wso2.carbon.registry/indexing/lastaccesstime - - - - - - - - - - - - - - - - - - - - - - false - - - - true - true - true - true - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml deleted file mode 100644 index 801f8cac..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/user-mgt.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - true - admin - - admin - admin - - everyone - true - jdbc/WSO2UserDB - - - - - org.wso2.carbon.user.core.tenant.JDBCTenantManager - false - true - true - ^[\S]{3,30}$ - ^[\S]{3,30}$ - Username pattern policy violated - ^[\S]{5,30}$ - ^[\S]{5,30}$ - Password length should be within 5 to 30 characters - ^[\S]{3,30}$ - ^[\S]{3,30}$ - true - false - true - SHA-256 - true - , - 100 - 100 - true - false - - - - - - - - - - - - - /permission - true - false - - - - - diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml new file mode 100644 index 00000000..a2023a15 --- /dev/null +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/conf/worker/deployment.yaml @@ -0,0 +1,632 @@ +################################################################################ +# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: ${NODE_IP} + # server name + name: WSO2 EI integrator Analytics + # dashboard type + # ports used by this server + ports: + # port offset + offset: 0 + type: wso2-ei-analytics + +wso2.transport.http: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 9091 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 9444 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + senderConfigurations: + - + id: "http-sender" + +siddhi.stores.query.api: + transportProperties: + - + name: "server.bootstrap.socket.timeout" + value: 60 + - + name: "client.bootstrap.socket.timeout" + value: 60 + - + name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - + id: "default" + host: "0.0.0.0" + port: 7070 + - + id: "msf4j-https" + host: "0.0.0.0" + port: 7443 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7612' + sslPort: '7712' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: 0.0.0.0 + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + +# This is the main configuration for metrics +wso2.metrics: + # Enable Metrics + enabled: true + reporting: + console: + - # The name for the Console Reporter + name: Console + + # Enable Console Reporter + enabled: false + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and printing in the console + pollingPeriod: 5 + +wso2.metrics.jdbc: + # Data Source Configurations for JDBC Reporters + dataSource: + # Default Data Source Configuration + - &JDBC01 + # JNDI name of the data source to be used by the JDBC Reporter. + # This data source should be defined in a *-datasources.xml file in conf/datasources directory. + dataSourceName: java:comp/env/jdbc/WSO2MetricsDB + # Schedule regular deletion of metrics data older than a set number of days. + # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. + # Deleting data older than seven days should be sufficient. + scheduledCleanup: + # Enable scheduled cleanup to delete Metrics data in the database. + enabled: true + + # The scheduled job will cleanup all data older than the specified days + daysToKeep: 7 + + # This is the period for each cleanup operation in seconds. + scheduledCleanupPeriod: 86400 + + # The JDBC Reporter is in the Metrics JDBC Core feature + reporting: + # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime + jdbc: + - # The name for the JDBC Reporter + name: JDBC + + # Enable JDBC Reporter + enabled: true + + # Source of Metrics, which will be used to identify each metric in database --> + # Commented to use the hostname by default + # source: Carbon + + # Alias referring to the Data Source configuration + dataSource: *JDBC01 + + # Polling Period in seconds. + # This is the period for polling metrics from the metric registry and updating the database with the values + pollingPeriod: 60 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # Periodic Persistence Configuration +state.persistence: + enabled: true + intervalInMin: 1 + revisionsToKeep: 3 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.DBPersistenceStore + config: + datasource: WSO2_PERSISTENCE_DB + table: PERSISTENCE_TABLE + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + # Datasource Configurations +wso2.datasources: + dataSources: + - + definition: + configuration: + connectionTestQuery: "SELECT 1" + driverClassName: com.mysql.jdbc.Driver + idleTimeout: 60000 + isAutoCommit: false + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_CARBON_DB?useSSL=false' + maxPoolSize: 10 + password: wso2carbon + username: wso2carbon + validationTimeout: 30000 + type: RDBMS + description: "The datasource used for registry and user manager" + name: WSO2_CARBON_DB + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_METRICS_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_CLUSTER_DB + description: The MySQL datasource used for Cluster Coordination + jndiConfig: + name: jdbc/WSO2ClusterDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_CLUSTER_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERSISTENCE_DB + description: The MySQL datasource used for system persistence + jndiConfig: + name: jdbc/WSO2PersistenceDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/WSO2_PERSISTENCE_DB?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for permission feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + validationTimeout: 30000 + isAutoCommit: false + + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: GEO_LOCATION_DATA +# description: "The data source used for geo location database" +# jndiConfig: +# name: jdbc/GEO_LOCATION_DATA +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/GEO_LOCATION_DATA;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: APIM_ANALYTICS_DB +# description: "The datasource used for APIM statistics aggregated data." +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +# - name: WSO2AM_MGW_ANALYTICS_DB +# description: "The datasource used for APIM MGW analytics data." +# jndiConfig: +# name: jdbc/WSO2AM_MGW_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + +siddhi: + extensions: + - + extension: + name: 'findCountryFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + - + extension: + name: 'findCityFromIP' + namespace: 'geo' + properties: + geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver + isCacheEnabled: true + cacheSize: 10000 + isPersistInDatabase: true + datasource: GEO_LOCATION_DATA + + # Cluster Configuration +cluster.config: + enabled: true + groupId: ei.analytics + coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy + strategyConfig: + datasource: WSO2_CLUSTER_DB + heartbeatInterval: 1000 + heartbeatMaxRetry: 2 + eventPollingInterval: 1000 + +deployment.config: + type: ha + eventByteBufferQueueCapacity: 20000 + byteBufferExtractorThreadPoolSize: 5 + eventSyncServer: + host: ${NODE_IP} + port: 9894 + bossThreads: 10 + workerThreads: 10 + eventSyncClientPool: + maxActive: 10 + maxTotal: 10 + maxIdle: 10 + maxWait: 60000 + minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Two node HA +#deployment.config: +# type: ha +# eventSyncServer: +# host: localhost +# port: 9893 +# advertisedHost: localhost +# advertisedPort: 9893 +# bossThreads: 10 +# workerThreads: 10 +# eventSyncClientPool: +# maxActive: 10 +# maxTotal: 10 +# maxIdle: 10 +# maxWait: 60000 +# minEvictableIdleTimeMillis: 120000 + + # Sample of deployment.config for Distributed deployment +#deployment.config: +# type: distributed +# httpsInterface: +# host: 192.168.1.3 +# port: 9443 +# username: admin +# password: admin +# leaderRetryInterval: 10000 +# resourceManagers: +# - host: 192.168.1.1 +# port: 9543 +# username: admin +# password: admin +# - host: 192.168.1.2 +# port: 9543 +# username: admin +# password: admin diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json deleted file mode 100644 index bae5c064..00000000 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-2/repository/deployment/server/jaggeryapps/portal/configs/designer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "store": { - "types": ["fs"] - }, - "gadgetGeneration" :{ - "isCreateGadgetEnable": false, - "ignoreProviders": ["rt"] - }, - "authentication": { - "activeMethod": "basic", - "methods": { - "sso": { - "attributes": { - "issuer": "portal", - "identityProviderURL": "https://localhost:9443/samlsso", - "responseSigningEnabled": true, - "validateAssertionValidityPeriod": true, - "validateAudienceRestriction": true, - "assertionSigningEnabled": true, - "acs": "https://localhost:9444/portal/acs", - "identityAlias": "wso2carbon", - "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", - "grantType": "urn:ietf:params:oauth:grant-type:saml2-bearer", - "useTenantKey": false, - "isPassive": false - } - }, - "basic": { - "attributes": {} - } - } - }, - "authorization": { - "activeMethod": "", - "methods": { - "oauth": { - "attributes": { - "apimgt-gateway": false, - "oauthProvider": { - "appRegistration": { - "appType": "webapp", - "clientName": "portal", - "owner": "admin", - "password":"admin", - "dynamicClientAppRegistrationServiceURL": "%https.host%/client-registration/v0.10/register", - "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", - "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", - "tokenScope": "admin", - "callbackUrl": "%https.host%/portal", - "saasApp":true - }, - "tokenServiceURL": "%https.host%/oauth2/token" - }, - "adminUser":"admin@carbon.super", - "adminUserTenantId":"-1234", - "adminRole":"admin", - "scopes" : [ - "device:view" - ] - } - } - } - }, - "designers": [ - "Internal/everyone" - ], - "tenantPrefix": "/t", - "shareStore": false, - "theme": "basic", - "cacheTimeoutSeconds": "5", - "cacheSizeBytes": "1073741824", - "defaultDashboardRedirect": false, - "isCreateGadgetEnable": true, - "isSecureVaultEnabled" : false, - "assets": { - "gadget": { - "fileSizeLimit": 5 - }, - "layout": { - "fileSizeLimit": 1 - } - }, - "oauth": { - "username": "admin", - "password": "admin" - }, - "host": { - "hostname": "localhost", - "port": "9444", - "protocol": "" - }, - "queryParameters" : { - "passBetweenPages" : ["shared"] - } -} diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-dashboard/conf/dashboard/deployment.yaml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-dashboard/conf/dashboard/deployment.yaml new file mode 100644 index 00000000..e661069c --- /dev/null +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/ei-analytics-dashboard/conf/dashboard/deployment.yaml @@ -0,0 +1,466 @@ +################################################################################ +# Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved +# +# Licensed under the Apache License, Version 2.0 (the \"License\"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +################################################################################ + + # Carbon Configuration Parameters +wso2.carbon: + # value to uniquely identify a server + id: wso2-sp + # server name + name: WSO2 Stream Processor + # ports used by this server + ports: + # port offset + offset: 2 + + # Configuration used for the databridge communication +databridge.config: + # No of worker threads to consume events + # THIS IS A MANDATORY FIELD + workerThreads: 10 + # Maximum amount of messages that can be queued internally in MB + # THIS IS A MANDATORY FIELD + maxEventBufferCapacity: 10000000 + # Queue size; the maximum number of events that can be stored in the queue + # THIS IS A MANDATORY FIELD + eventBufferSize: 2000 + # Keystore file path + # THIS IS A MANDATORY FIELD + keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks + # Keystore password + # THIS IS A MANDATORY FIELD + keyStorePassword : wso2carbon + # Session Timeout value in mins + # THIS IS A MANDATORY FIELD + clientTimeoutMin: 30 + # Data receiver configurations + # THIS IS A MANDATORY FIELD + dataReceivers: + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Thrift + # Data receiver properties + properties: + tcpPort: '7611' + sslPort: '7711' + + - + # Data receiver configuration + dataReceiver: + # Data receiver type + # THIS IS A MANDATORY FIELD + type: Binary + # Data receiver properties + properties: + tcpPort: '9611' + sslPort: '9711' + tcpReceiverThreadPoolSize: '100' + sslReceiverThreadPoolSize: '100' + hostName: 0.0.0.0 + + # Configuration of the Data Agents - to publish events through databridge +data.agent.config: + # Data agent configurations + # THIS IS A MANDATORY FIELD + agents: + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Thrift + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + - + # Data agent configuration + agentConfiguration: + # Data agent name + # THIS IS A MANDATORY FIELD + name: Binary + # Data endpoint class + # THIS IS A MANDATORY FIELD + dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint + # Data publisher strategy + publishingStrategy: async + # Trust store path + trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' + # Trust store password + trustStorePassword: 'wso2carbon' + # Queue Size + queueSize: 32768 + # Batch Size + batchSize: 200 + # Core pool size + corePoolSize: 1 + # Socket timeout in milliseconds + socketTimeoutMS: 30000 + # Maximum pool size + maxPoolSize: 1 + # Keep alive time in pool + keepAliveTimeInPool: 20 + # Reconnection interval + reconnectionInterval: 30 + # Max transport pool size + maxTransportPoolSize: 250 + # Max idle connections + maxIdleConnections: 250 + # Eviction time interval + evictionTimePeriod: 5500 + # Min idle time in pool + minIdleTimeInPool: 5000 + # Secure max transport pool size + secureMaxTransportPoolSize: 250 + # Secure max idle connections + secureMaxIdleConnections: 250 + # secure eviction time period + secureEvictionTimePeriod: 5500 + # Secure min idle time in pool + secureMinIdleTimeInPool: 5000 + # SSL enabled protocols + sslEnabledProtocols: TLSv1.1,TLSv1.2 + # Ciphers + ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 + + # Deployment configuration parameters +wso2.artifact.deployment: + # Scheduler update interval + updateInterval: 5 + + # HA Configuration +state.persistence: + enabled: false + intervalInMin: 1 + revisionsToKeep: 2 + persistenceStore: org.wso2.carbon.stream.processor.core.persistence.FileSystemPersistenceStore + config: + location: siddhi-app-persistence + + # Secure Vault Configuration +wso2.securevault: + secretRepository: + type: org.wso2.carbon.secvault.repository.DefaultSecretRepository + parameters: + privateKeyAlias: wso2carbon + keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks + secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties + masterKeyReader: + type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader + parameters: + masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml + + +# Data Sources Configuration +wso2.datasources: + dataSources: + # Dashboard data source + - name: WSO2_DASHBOARD_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/DASHBOARD_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/DASHBOARD_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 20 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + - name: BUSINESS_RULES_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/BUSINESS_RULES_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/BUSINESS_RULES_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 20 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: SAMPLE_DB +# description: Sample datasource used for gadgets generation wizard +# jndiConfig: +# name: jdbc/SAMPLE_DB +# useJndiReference: true +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/SAMPLE_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 10 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + # Dashboard data source + - name: WSO2_STATUS_DASHBOARD_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/wso2_status_dashboard + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/wso2_status_dashboard;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 20 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + # carbon metrics data source + - name: WSO2_METRICS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/WSO2MetricsDB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/metrics;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 20 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + - name: WSO2_PERMISSIONS_DB + description: The datasource used for dashboard feature + jndiConfig: + name: jdbc/PERMISSION_DB + useJndiReference: true + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 10 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + - name: HTTP_ANALYTICS_DB + description: The datasource used for HTTP Analytics dashboard + jndiConfig: + name: jdbc/HTTP_ANALYTICS_DB + useJndiReference: false + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false +# - name: Twitter_Analytics +# description: The datasource used for Twitter Analytics dashboard +# jndiConfig: +# name: jdbc/Twitter_Analytics +# useJndiReference: false +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 30 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + - name: Message_Tracing_DB + description: "The datasource used for message tracer to store span information." + jndiConfig: + name: jdbc/Message_Tracing_DB + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' + username: wso2carbon + password: wso2carbon + driverClassName: org.h2.Driver + maxPoolSize: 30 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + +# - name: IS_ANALYTICS_DB +# description: "The data source used for WSO2 IS Analytics statistics" +# jndiConfig: +# name: jdbc/IS_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/IS_ANALYTICS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# validationTimeout: 30000 +# isAutoCommit: false + + + - name: EI_ANALYTICS + description: "The datasource used for EI Analytics dashboard feature" + jndiConfig: + name: jdbc/EI_ANALYTICS + definition: + type: RDBMS + configuration: + jdbcUrl: 'jdbc:mysql://wso2ei-integrator-broker-with-analytics-rdbms-service-mysql:3306/EI_ANALYTICS?useSSL=false' + username: wso2carbon + password: wso2carbon + driverClassName: com.mysql.jdbc.Driver + maxPoolSize: 50 + idleTimeout: 60000 + connectionTestQuery: SELECT 1 + validationTimeout: 30000 + isAutoCommit: false + + #Data source for APIM Analytics +# - name: APIM_ANALYTICS_DB +# description: Datasource used for APIM Analytics +# jndiConfig: +# name: jdbc/APIM_ANALYTICS_DB +# definition: +# type: RDBMS +# configuration: +# jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' +# username: wso2carbon +# password: wso2carbon +# driverClassName: org.h2.Driver +# maxPoolSize: 50 +# idleTimeout: 60000 +# connectionTestQuery: SELECT 1 +# validationTimeout: 30000 +# isAutoCommit: false + + +wso2.business.rules.manager: + datasource: BUSINESS_RULES_DB + # rule template wise configuration for deploying business rules + deployment_configs: + - + # : of the Worker node + localhost:9443: + # UUIDs of rule templates that are needed to be deployed on the node + - stock-data-analysis + - stock-exchange-input + - stock-exchange-output + - identifying-continuous-production-decrease + - popular-tweets-analysis + - http-analytics-processing + - message-tracing-source-template + - message-tracing-app-template + # credentials for worker nodes + username: admin + password: admin + +wso2.status.dashboard: + pollingInterval: 5 + metricsDatasourceName: 'WSO2_METRICS_DB' + dashboardDatasourceName: 'WSO2_STATUS_DASHBOARD_DB' + workerAccessCredentials: + username: 'admin' + password: 'admin' + +wso2.transport.http: + transportProperties: + - name: "server.bootstrap.socket.timeout" + value: 60 + - name: "client.bootstrap.socket.timeout" + value: 60 + - name: "latency.metrics.enabled" + value: true + + listenerConfigurations: + - id: "default-https" + host: "0.0.0.0" + port: 9643 + scheme: https + keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" + keyStorePassword: wso2carbon + certPass: wso2carbon diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/axis2/axis2.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/axis2/axis2.xml index 79ab23ba..8cf54c7b 100644 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/axis2/axis2.xml +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/axis2/axis2.xml @@ -62,8 +62,8 @@ axis2modules - WSO2 EI 6.3.0 - WSO2 EI 6.3.0 + WSO2 EI 6.4.0 + WSO2 EI 6.4.0 diff --git a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/carbon.xml b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/carbon.xml index d81f458a..707c20f9 100644 --- a/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/carbon.xml +++ b/helm/integrator-broker-with-analytics/integrator-broker-with-analytics/confs/integrator/conf/carbon.xml @@ -36,7 +36,7 @@ - 6.3.0 + 6.4.0 - + + + + + + true + + + org.wso2.carbon.crypto.provider.KeyStoreBasedInternalCryptoProvider + + + org.wso2.carbon.core.encryption.KeyStoreBasedExternalCryptoProvider + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + +