From f606ce0ea366541d228107acf2e5c4f6203d98fc Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Thu, 7 Jun 2018 14:18:59 +0300
Subject: [PATCH 01/17] k8s: fix usage of 'pullPolicy' values

---
 CHANGELOG.md                                               | 5 +++++
 k8s/devicehive/templates/dh-auth-deployment.yaml           | 2 +-
 k8s/devicehive/templates/dh-backend-deployment.yaml        | 2 +-
 k8s/devicehive/templates/dh-backend-node-deployment.yaml   | 2 +-
 k8s/devicehive/templates/dh-frontend-deployment.yaml       | 2 +-
 k8s/devicehive/templates/dh-hazelcast-deployment.yaml      | 2 +-
 k8s/devicehive/templates/dh-plugin-deployment.yaml         | 2 +-
 k8s/devicehive/templates/dh-proxy-deployment.yaml          | 2 +-
 k8s/devicehive/templates/mqtt-broker-deployment.yaml       | 2 +-
 k8s/devicehive/templates/ws-proxy-external-deployment.yaml | 2 +-
 k8s/devicehive/templates/ws-proxy-internal-deployment.yaml | 2 +-
 11 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d64f3bd..f9a5570 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Development
+
+### Kubernetes
+* Fix usage of 'pullPolicy' values in deployments
+
 ## 3.5.0 / 2018-06-04
 
 * k8s: add parameters for log level configuration in Java Server services
diff --git a/k8s/devicehive/templates/dh-auth-deployment.yaml b/k8s/devicehive/templates/dh-auth-deployment.yaml
index fa829c8..6dbd72a 100644
--- a/k8s/devicehive/templates/dh-auth-deployment.yaml
+++ b/k8s/devicehive/templates/dh-auth-deployment.yaml
@@ -18,7 +18,7 @@ spec:
       containers:
       - name: devicehive-auth
         image: "{{ .Values.javaServer.repository }}/devicehive-auth:{{ .Values.javaServer.tag }}"
-        imagePullPolicy: {{ .Values.javaServer.PullPolicy }}
+        imagePullPolicy: {{ .Values.javaServer.pullPolicy }}
         env:
         {{- if eq .Values.javaServer.bus "rpc" }}
         - name: SPRING_PROFILES_ACTIVE
diff --git a/k8s/devicehive/templates/dh-backend-deployment.yaml b/k8s/devicehive/templates/dh-backend-deployment.yaml
index 9203729..0d4dd09 100644
--- a/k8s/devicehive/templates/dh-backend-deployment.yaml
+++ b/k8s/devicehive/templates/dh-backend-deployment.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: devicehive-backend
         image: "{{ .Values.javaServer.repository }}/devicehive-backend:{{ .Values.javaServer.tag }}"
-        imagePullPolicy: {{ .Values.javaServer.PullPolicy }}
+        imagePullPolicy: {{ .Values.javaServer.pullPolicy }}
         env:
         {{- if eq .Values.javaServer.bus "rpc" }}
         - name: SPRING_PROFILES_ACTIVE
diff --git a/k8s/devicehive/templates/dh-backend-node-deployment.yaml b/k8s/devicehive/templates/dh-backend-node-deployment.yaml
index 0a3b50e..a0950bf 100644
--- a/k8s/devicehive/templates/dh-backend-node-deployment.yaml
+++ b/k8s/devicehive/templates/dh-backend-node-deployment.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: devicehive-backend-node
         image: {{ .Values.backendNode.image | quote }}
-        imagePullPolicy: {{ .Values.backendNode.PullPolicy }}
+        imagePullPolicy: {{ .Values.backendNode.pullPolicy }}
         env:
         - name: ENVSEPARATOR
           value: '_'
diff --git a/k8s/devicehive/templates/dh-frontend-deployment.yaml b/k8s/devicehive/templates/dh-frontend-deployment.yaml
index 01cb063..b1979d4 100644
--- a/k8s/devicehive/templates/dh-frontend-deployment.yaml
+++ b/k8s/devicehive/templates/dh-frontend-deployment.yaml
@@ -18,7 +18,7 @@ spec:
       containers:
       - name: devicehive-frontend
         image: "{{ .Values.javaServer.repository }}/devicehive-frontend:{{ .Values.javaServer.tag }}"
-        imagePullPolicy: {{ .Values.javaServer.PullPolicy }}
+        imagePullPolicy: {{ .Values.javaServer.pullPolicy }}
         env:
         {{- if eq .Values.javaServer.bus "rpc" }}
         - name: SPRING_PROFILES_ACTIVE
diff --git a/k8s/devicehive/templates/dh-hazelcast-deployment.yaml b/k8s/devicehive/templates/dh-hazelcast-deployment.yaml
index d65f46f..94644f1 100644
--- a/k8s/devicehive/templates/dh-hazelcast-deployment.yaml
+++ b/k8s/devicehive/templates/dh-hazelcast-deployment.yaml
@@ -18,7 +18,7 @@ spec:
       containers:
       - name: devicehive-hazelcast
         image: "{{ .Values.javaServer.repository }}/devicehive-hazelcast:{{ .Values.javaServer.tag }}"
-        imagePullPolicy: {{ .Values.javaServer.PullPolicy }}
+        imagePullPolicy: {{ .Values.javaServer.pullPolicy }}
         env:
         - name: MIN_HEAP_SIZE
           value: {{ .Values.javaServer.hazelcast.minHeapSize | quote }}
diff --git a/k8s/devicehive/templates/dh-plugin-deployment.yaml b/k8s/devicehive/templates/dh-plugin-deployment.yaml
index 77b122f..9bd9dfe 100644
--- a/k8s/devicehive/templates/dh-plugin-deployment.yaml
+++ b/k8s/devicehive/templates/dh-plugin-deployment.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: devicehive-plugin
         image: "{{ .Values.javaServer.repository }}/devicehive-plugin:{{ .Values.javaServer.tag }}"
-        imagePullPolicy: {{ .Values.javaServer.PullPolicy }}
+        imagePullPolicy: {{ .Values.javaServer.pullPolicy }}
         env:
         {{- if eq .Values.javaServer.bus "rpc" }}
         - name: SPRING_PROFILES_ACTIVE
diff --git a/k8s/devicehive/templates/dh-proxy-deployment.yaml b/k8s/devicehive/templates/dh-proxy-deployment.yaml
index 9abd2ad..90be3f8 100644
--- a/k8s/devicehive/templates/dh-proxy-deployment.yaml
+++ b/k8s/devicehive/templates/dh-proxy-deployment.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: devicehive-proxy
         image: {{ .Values.proxy.image | quote }}
-        imagePullPolicy: {{ .Values.proxy.PullPolicy }}
+        imagePullPolicy: {{ .Values.proxy.pullPolicy }}
         ports:
         - name: http
           containerPort: 8080
diff --git a/k8s/devicehive/templates/mqtt-broker-deployment.yaml b/k8s/devicehive/templates/mqtt-broker-deployment.yaml
index 26dff27..5279c3e 100644
--- a/k8s/devicehive/templates/mqtt-broker-deployment.yaml
+++ b/k8s/devicehive/templates/mqtt-broker-deployment.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: mqtt-broker
         image: {{ .Values.mqttBroker.image | quote }}
-        imagePullPolicy: {{ .Values.mqttBroker.PullPolicy }}
+        imagePullPolicy: {{ .Values.mqttBroker.pullPolicy }}
         env:
         - name: ENVSEPARATOR
           value: "_"
diff --git a/k8s/devicehive/templates/ws-proxy-external-deployment.yaml b/k8s/devicehive/templates/ws-proxy-external-deployment.yaml
index 71585aa..76ba1d6 100644
--- a/k8s/devicehive/templates/ws-proxy-external-deployment.yaml
+++ b/k8s/devicehive/templates/ws-proxy-external-deployment.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: devicehive-ws-proxy-external
         image: {{ .Values.wsProxy.image | quote }}
-        imagePullPolicy: {{ .Values.wsProxy.PullPolicy }}
+        imagePullPolicy: {{ .Values.wsProxy.pullPolicy }}
         env:
         - name: ENVSEPARATOR
           value: '_'
diff --git a/k8s/devicehive/templates/ws-proxy-internal-deployment.yaml b/k8s/devicehive/templates/ws-proxy-internal-deployment.yaml
index ae905fb..59f708d 100644
--- a/k8s/devicehive/templates/ws-proxy-internal-deployment.yaml
+++ b/k8s/devicehive/templates/ws-proxy-internal-deployment.yaml
@@ -19,7 +19,7 @@ spec:
       containers:
       - name: devicehive-ws-proxy-internal
         image: {{ .Values.wsProxy.image | quote }}
-        imagePullPolicy: {{ .Values.wsProxy.PullPolicy }}
+        imagePullPolicy: {{ .Values.wsProxy.pullPolicy }}
         env:
         - name: ENVSEPARATOR
           value: '_'

From ae597dd21dc66a3ae14c54100f96482409a841aa Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Thu, 7 Jun 2018 15:53:23 +0300
Subject: [PATCH 02/17] Revert "k8s: revert changes for env setup in
 deployments."

This reverts commit e10bb1d16fb320703abafec49dd01758a2783e6e.
---
 CHANGELOG.md                                         |  1 +
 k8s/devicehive/templates/dh-auth-deployment.yaml     |  8 ++++----
 k8s/devicehive/templates/dh-backend-deployment.yaml  |  8 ++++----
 k8s/devicehive/templates/dh-frontend-deployment.yaml | 12 ++++++------
 k8s/devicehive/templates/dh-plugin-deployment.yaml   |  8 ++++----
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9a5570..92e65ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Kubernetes
 * Fix usage of 'pullPolicy' values in deployments
+* Change env vars setup for deployments. Setup only necessary vars for choosen bus type
 
 ## 3.5.0 / 2018-06-04
 
diff --git a/k8s/devicehive/templates/dh-auth-deployment.yaml b/k8s/devicehive/templates/dh-auth-deployment.yaml
index 6dbd72a..b183213 100644
--- a/k8s/devicehive/templates/dh-auth-deployment.yaml
+++ b/k8s/devicehive/templates/dh-auth-deployment.yaml
@@ -23,16 +23,16 @@ spec:
         {{- if eq .Values.javaServer.bus "rpc" }}
         - name: SPRING_PROFILES_ACTIVE
           value: "rpc-client"
-        {{- else }}
-        - name: DH_WS_PROXY
-          value: "{{ .Release.Name }}-devicehive-ws-proxy-internal:3000"
-        {{- end }}
         - name: DH_KAFKA_BOOTSTRAP_SERVERS
           value: "{{ .Release.Name }}-kafka:9092"
         - name: DH_ZK_ADDRESS
           value: "{{ .Release.Name }}-zookeeper"
         - name: DH_ZK_PORT
           value: "2181"
+        {{- else }}
+        - name: DH_WS_PROXY
+          value: "{{ .Release.Name }}-devicehive-ws-proxy-internal:3000"
+        {{- end }}
         - name: DH_POSTGRES_ADDRESS
           value: "{{ .Release.Name }}-postgresql"
         - name: DH_POSTGRES_DB
diff --git a/k8s/devicehive/templates/dh-backend-deployment.yaml b/k8s/devicehive/templates/dh-backend-deployment.yaml
index 0d4dd09..9247405 100644
--- a/k8s/devicehive/templates/dh-backend-deployment.yaml
+++ b/k8s/devicehive/templates/dh-backend-deployment.yaml
@@ -24,16 +24,16 @@ spec:
         {{- if eq .Values.javaServer.bus "rpc" }}
         - name: SPRING_PROFILES_ACTIVE
           value: "rpc-server"
-        {{- else }}
-        - name: DH_WS_PROXY
-          value: "{{ .Release.Name }}-devicehive-ws-proxy-internal:3000"
-        {{- end }}
         - name: DH_KAFKA_BOOTSTRAP_SERVERS
           value: "{{ .Release.Name }}-kafka:9092"
         - name: DH_ZK_ADDRESS
           value: "{{ .Release.Name }}-zookeeper"
         - name: DH_ZK_PORT
           value: "2181"
+        {{- else }}
+        - name: DH_WS_PROXY
+          value: "{{ .Release.Name }}-devicehive-ws-proxy-internal:3000"
+        {{- end }}
         - name: DH_POSTGRES_ADDRESS
           value: "{{ .Release.Name }}-postgresql"
         - name: DH_POSTGRES_DB
diff --git a/k8s/devicehive/templates/dh-frontend-deployment.yaml b/k8s/devicehive/templates/dh-frontend-deployment.yaml
index b1979d4..235ffcd 100644
--- a/k8s/devicehive/templates/dh-frontend-deployment.yaml
+++ b/k8s/devicehive/templates/dh-frontend-deployment.yaml
@@ -21,18 +21,18 @@ spec:
         imagePullPolicy: {{ .Values.javaServer.pullPolicy }}
         env:
         {{- if eq .Values.javaServer.bus "rpc" }}
-        - name: SPRING_PROFILES_ACTIVE
-          value: "rpc-client"
-        {{- else }}
-        - name: DH_WS_PROXY
-          value: "{{ .Release.Name }}-devicehive-ws-proxy-internal:3000"
-        {{- end }}
         - name: DH_KAFKA_BOOTSTRAP_SERVERS
           value: "{{ .Release.Name }}-kafka:9092"
         - name: DH_ZK_ADDRESS
           value: "{{ .Release.Name }}-zookeeper"
         - name: DH_ZK_PORT
           value: "2181"
+        - name: SPRING_PROFILES_ACTIVE
+          value: "rpc-client"
+        {{- else }}
+        - name: DH_WS_PROXY
+          value: "{{ .Release.Name }}-devicehive-ws-proxy-internal:3000"
+        {{- end }}
         - name: DH_AUTH_URL
           value: "http://{{ .Release.Name }}-devicehive-auth:8090/auth/rest"
         - name: DH_POSTGRES_ADDRESS
diff --git a/k8s/devicehive/templates/dh-plugin-deployment.yaml b/k8s/devicehive/templates/dh-plugin-deployment.yaml
index 9bd9dfe..6acea16 100644
--- a/k8s/devicehive/templates/dh-plugin-deployment.yaml
+++ b/k8s/devicehive/templates/dh-plugin-deployment.yaml
@@ -24,10 +24,6 @@ spec:
         {{- if eq .Values.javaServer.bus "rpc" }}
         - name: SPRING_PROFILES_ACTIVE
           value: "rpc-client"
-        {{- else }}
-        - name: DH_WS_PROXY
-          value: "{{ .Release.Name }}-devicehive-ws-proxy-internal:3000"
-        {{- end }}
         - name: DH_KAFKA_BOOTSTRAP_SERVERS
           value: "{{ .Release.Name }}-kafka:9092"
         - name: DH_ZK_ADDRESS
@@ -36,6 +32,10 @@ spec:
           value: "2181"
         - name: DH_RPC_CLIENT_RES_CONS_THREADS
           value: "3"
+        {{- else }}
+        - name: DH_WS_PROXY
+          value: "{{ .Release.Name }}-devicehive-ws-proxy-internal:3000"
+        {{- end }}
         - name: DH_AUTH_URL
           value: "http://{{ .Release.Name }}-devicehive-auth:8090/auth/rest"
         - name: DH_POSTGRES_ADDRESS

From f5a4c87cdb1d8420094abbafd48804008c52f144 Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Thu, 14 Jun 2018 17:28:28 +0300
Subject: [PATCH 03/17] docs: move DeviceHive chart README to chart directory

---
 README.md                      | 2 +-
 k8s/{ => devicehive}/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename k8s/{ => devicehive}/README.md (98%)

diff --git a/README.md b/README.md
index d65a933..4971180 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ More details in the [rdbms-image](rdbms-image/) subdirectory.
 Installation was tested on machine with CentOS 7 distribution.
 
 ## Kubernetes installation
-DeviceHive can be installed on Kubernetes with provided [Helm chart](k8s/). This chart also installs PostgreSQL chart and Kafka chart from [Kubeapps](https://kubeapps.com) repositories. External installations of PostgreSQL and Kafka are not supported at the moment.
+DeviceHive can be installed on Kubernetes with provided [Helm chart](k8s/devicehive). This chart also installs PostgreSQL chart and Kafka chart from [Kubeapps](https://kubeapps.com) repositories. External installations of PostgreSQL and Kafka are not supported at the moment.
 
 Previous installation method on Kubernetes using a `kubectl` utility and a plain YAML files are deprecated now. Please [issue a ticket](https://github.com/devicehive/devicehive-docker/issues/new) in our [GitHub repository](https://github.com/devicehive/devicehive-docker/) if you have questions about mirgating such environment to the one deployed with Helm chart.
 
diff --git a/k8s/README.md b/k8s/devicehive/README.md
similarity index 98%
rename from k8s/README.md
rename to k8s/devicehive/README.md
index f3d0ad1..ab6f9dd 100644
--- a/k8s/README.md
+++ b/k8s/devicehive/README.md
@@ -38,7 +38,7 @@ The command deploys DeviceHive on the Kubernetes cluster in the default configur
 Default DeviceHive admin user has name `dhadmin` and password `dhadmin_#911`.
 
 ### Service endpoints
-Table below lists endpoints where you can find various DeviceHive services. If `proxy.ingress` set to `true`, replace *localhost* with hostname(s) used in `proxy.ingress.hosts` parameter.
+Table below lists endpoints where you can find various DeviceHive services. If `ingress` set to `true`, replace *localhost* with hostname(s) used in `ingress.hosts` parameter.
 
 | Service              | URL                               | Notes                        |
 |----------------------|-----------------------------------|------------------------------|

From e9e8fe0b42ca52b1042fdf3ebae410a3a44a8852 Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Fri, 15 Jun 2018 14:23:31 +0300
Subject: [PATCH 04/17] docs: document autoscaling for 'devicehive' chart

---
 k8s/devicehive/README.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/k8s/devicehive/README.md b/k8s/devicehive/README.md
index ab6f9dd..14aa0cc 100644
--- a/k8s/devicehive/README.md
+++ b/k8s/devicehive/README.md
@@ -160,3 +160,31 @@ To manually setup RBAC you need to set the parameter rbac.create=false and speci
 
 ### Ingress TLS
 Ingress TLS doesn't supported yet by this Helm chart.
+
+### Setting up horizontal autoscaling for services
+
+Autoscaling DeviceHive in Kubernetes relies on Horizontal Pod Authoscaler in your cluster. DeviceHive Helm chart provides ability to set resources for pods and cluster administrator have to create HPA manualy.
+
+When deploying application specify .resource.requests values, see [Configuration section](#configuration) for available values. Here is example from `values.yaml` file used by `helm install --name test ./devicehive -f values.yaml`:
+```yaml
+javaServer:
+  backend:
+    resources:
+      requests:
+        cpu: 2
+        memory: 1536Mi
+  frontend:
+    resources:
+      requests:
+        cpu: 2
+        memory: 1536Mi
+```
+
+When resources.requests for pods are set create hpa by issuing follwing commands:
+```console
+$ kubectl autoscale deployment test-devicehive-backend --cpu-percent=70 --min=1 --max=3
+$ kubectl autoscale deployment test-devicehive-frontend --cpu-percent=70 --min=1 --max=3
+$ kubectl get hpa
+```
+
+> **Note**: resources.requests values and HPA configuration provided above had to be tweaked for your deployment. Please consult [HPA walkthrough](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/) in Kubernetes documentation for more details.

From 89aabcdceba56c933df9474f3d2866959d81b203 Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Fri, 15 Jun 2018 14:24:25 +0300
Subject: [PATCH 05/17] docs: document Cassandra storage plugin in root README

---
 CHANGELOG.md | 1 +
 README.md    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92e65ea..a01ef41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Kubernetes
 * Fix usage of 'pullPolicy' values in deployments
 * Change env vars setup for deployments. Setup only necessary vars for choosen bus type
+* Documentation updates
 
 ## 3.5.0 / 2018-06-04
 
diff --git a/README.md b/README.md
index 4971180..342d0b1 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,14 @@ More details in the [rdbms-image](rdbms-image/) subdirectory.
 Installation was tested on machine with CentOS 7 distribution.
 
 ## Kubernetes installation
-DeviceHive can be installed on Kubernetes with provided [Helm chart](k8s/devicehive). This chart also installs PostgreSQL chart and Kafka chart from [Kubeapps](https://kubeapps.com) repositories. External installations of PostgreSQL and Kafka are not supported at the moment.
+### DeviceHive
+DeviceHive can be installed on Kubernetes with provided [devicehive Helm chart](k8s/devicehive). This chart also installs PostgreSQL chart and Kafka chart from [Kubeapps](https://kubeapps.com) repositories. External installations of PostgreSQL and Kafka are not supported at the moment.
 
 Previous installation method on Kubernetes using a `kubectl` utility and a plain YAML files are deprecated now. Please [issue a ticket](https://github.com/devicehive/devicehive-docker/issues/new) in our [GitHub repository](https://github.com/devicehive/devicehive-docker/) if you have questions about mirgating such environment to the one deployed with Helm chart.
 
+### Cassandra storage plugin
+DeviceHive Cassandra storage plugin can be installed on Kubernetes with provided [devicehive-cassandra-plugin Helm chart](k8s/devicehive-cassandra-plugin). It requires already running cassandra cluster. README file contains [example installation of Cassandra](k8s/devicehive-cassandra-plugin/README.md#example-installation-with-cassandra-cluster-installed-via-helm) with Helm for tests.
+
 ## Installation on Docker for Windows or Docker for Mac
 If you like to try DeviceHive using Docker for Windows or Docker for Mac, please note that this software runs Docker in special Virtual Machine (that got automaticaly created for you by installer). By default these Virtual Machines with much lower parameters that required for DeviceHive, 2GB of RAM and 2 vCPU. Here is example of how to change parameters in Docker for Windows, on Macs this should be similar:
 

From 33bc94385d5db4a4f0ed465b68779710c704a898 Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Fri, 15 Jun 2018 16:34:12 +0300
Subject: [PATCH 06/17] compose: add devicehive CoAP proxy

---
 CHANGELOG.md                      |  3 +++
 rdbms-image/README.md             | 14 ++++++++++++++
 rdbms-image/coap-proxy.yml        | 19 +++++++++++++++++++
 rdbms-image/nginx-coap-proxy.conf | 10 ++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 rdbms-image/coap-proxy.yml
 create mode 100644 rdbms-image/nginx-coap-proxy.conf

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a01ef41..6dbbfde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 * Change env vars setup for deployments. Setup only necessary vars for choosen bus type
 * Documentation updates
 
+### Docker Compose
+* Add compose file for CoAP-WebSockets proxy
+
 ## 3.5.0 / 2018-06-04
 
 * k8s: add parameters for log level configuration in Java Server services
diff --git a/rdbms-image/README.md b/rdbms-image/README.md
index 2264147..1ffbcc5 100644
--- a/rdbms-image/README.md
+++ b/rdbms-image/README.md
@@ -40,6 +40,7 @@ Table below lists endpoints where you can find various DeviceHive services. Repl
 |    1883 | MQTT brokers     | If enabled                    |
 |    2181 | Zookeeper        |                               |
 |    5432 | PostgreSQL DB    |                               |
+|    5683 | CoAP-WebSockets proxy | If enabled, see [CoAP-WebSockets proxy](#coap-websockets-proxy) section below |
 |    5701 | Hazelcast        |                               |
 |    7071 | Kafka metrics    | If enabled, see [Kafka metrics](#kafka-metrics) section below |
 |    8080 | Frontend service |                               |
@@ -113,6 +114,19 @@ To enable DeviceHive to communicate over Apache Kafka message bus to scale out a
 * `DH_RPC_CLIENT_RES_CONS_THREADS` - Kafka response consumer threads in the Frontend, defaults to `3`.
 * `DH_AUTH_SPRING_PROFILES_ACTIVE`, `DH_FE_SPRING_PROFILES_ACTIVE`, `DH_BE_SPRING_PROFILES_ACTIVE` and `DH_PLUGIN_SPRING_PROFILES_ACTIVE` - Changes which Spring profile use for Auth, Frontend, Backend and Plugin sevices respectively. Defaults to `ws-kafka-proxy-frontend` for Frontend, `ws-kafka-proxy-backend` for Backend and `ws-kafka-proxy` for Auth/Plugin. Can be changed to `rpc-client` for Auth/Frontend/Plugin and `rpc-server` for Backend to use direct connection to Kafka instead of devicehive-ws-proxy service.
 
+### CoAP-WebSockets proxy
+The [devicehive-coap-proxy][coap-proxy-url] is a CoAP to WebSockets proxy between CoAP clients and DeviceHive server. The proxy uses WebSocket sessions to communicate with DeviceHive Server and listens on standard CoAP UDP port 5683 for clients.
+
+To enable optional DeviceHive MQTT brokers run DeviceHive with the following command. This will start MQTT brokers on port 1883 and internal Redis container:
+
+```
+sudo docker-compose -f docker-compose.yml -f coap-proxy.yml
+```
+
+Or add line `COMPOSE_FILE=docker-compose.yml:coap-proxy.yml` in `.env` file.
+
+[coap-proxy-url]: https://github.com/devicehive/devicehive-coap-proxy
+
 ### MQTT brokers
 The [devicehive-mqtt plugin][dh-mqtt-url] is a MQTT transport layer between MQTT clients and DeviceHive server. The broker uses WebSocket sessions to communicate with DeviceHive Server and Redis server for persistence functionality.
 
diff --git a/rdbms-image/coap-proxy.yml b/rdbms-image/coap-proxy.yml
new file mode 100644
index 0000000..5c54f3a
--- /dev/null
+++ b/rdbms-image/coap-proxy.yml
@@ -0,0 +1,19 @@
+version: "3"
+services:
+  coap_proxy:
+    image: devicehive/devicehive-coap-proxy:1.0.0
+    links:
+      - dh_frontend
+    restart: unless-stopped
+    environment:
+      - PROXY.HOST=0.0.0.0
+      - PROXY.PORT=5683
+      - PROXY.TARGET=ws://dh_frontend:8080/api/websocket
+
+  dh_proxy:
+    ports:
+      - "5683:5683/udp"
+    links:
+      - coap_proxy
+    volumes:
+      - "./nginx-coap-proxy.conf:/etc/nginx/stream.d/nginx-coap-proxy.conf:ro,Z"
diff --git a/rdbms-image/nginx-coap-proxy.conf b/rdbms-image/nginx-coap-proxy.conf
new file mode 100644
index 0000000..ebaefc1
--- /dev/null
+++ b/rdbms-image/nginx-coap-proxy.conf
@@ -0,0 +1,10 @@
+upstream coap_proxy {
+    server coap_proxy:5683;
+    zone tcp_mem 64k;
+}
+
+server {
+    listen 5683 udp;
+    proxy_pass coap_proxy;
+    proxy_connect_timeout 1s;
+}

From d2a3ab25f02592a9f04a3166b17111b9d6dc208e Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Fri, 15 Jun 2018 17:45:45 +0300
Subject: [PATCH 07/17] k8s: add CoAP-WebSockets proxy deployment and service

---
 CHANGELOG.md                                  |  1 +
 k8s/devicehive/README.md                      |  7 ++++
 .../templates/coap-proxy-deployment.yaml      | 42 +++++++++++++++++++
 .../templates/coap-proxy-service.yaml         | 14 +++++++
 k8s/devicehive/values.yaml                    | 10 +++++
 5 files changed, 74 insertions(+)
 create mode 100644 k8s/devicehive/templates/coap-proxy-deployment.yaml
 create mode 100644 k8s/devicehive/templates/coap-proxy-service.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dbbfde..5f70428 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Fix usage of 'pullPolicy' values in deployments
 * Change env vars setup for deployments. Setup only necessary vars for choosen bus type
 * Documentation updates
+* Add CoAP-WebSockets proxy deployment and service in chart
 
 ### Docker Compose
 * Add compose file for CoAP-WebSockets proxy
diff --git a/k8s/devicehive/README.md b/k8s/devicehive/README.md
index 14aa0cc..f36358c 100644
--- a/k8s/devicehive/README.md
+++ b/k8s/devicehive/README.md
@@ -102,6 +102,13 @@ Parameter | Description | Default
 `backendNode.loggerLevel` | Node backend logger level (levels: debug, info, warn, error ) | `info`
 `backendNode.replicaCount` | Desired number of Node backend pods | `1`
 `backendNode.resources` | Node backend  resource requests and limits | `{}`
+`coapProxy.enabled` | If true, CoAP-WebSockets proxy will be deployed | `false`
+`coapProxy.image` | CoAP-WebSockets proxy image and tag | `devicehive/devicehive-coap-proxy:1.0.0`
+`coapProxy.pullPolicy`| CoAP-WebSockets proxy image pull policy | `IfNotPresent`
+`coapProxy.replicaCount` | Desired number of CoAP-WebSockets proxy pods | `1`
+`coapProxy.resources` | CoAP-WebSockets proxy deployment resource requests and limits | `{}`
+`coapProxy.service.type` | Type of CoAP-WebSockets proxy service to create | `ClusterIP`
+`coapProxy.service.port` | CoAP-WebSockets proxy service port | `5683`
 `mqttBroker.enabled` | If true, DH MQTT broker will be deployed | `false`
 `mqttBroker.appLogLevel` | Application logger level (levels: debug, info, warn, error) | `info`
 `mqttBroker.image` | MQTT broker image and tag | `devicehive/devicehive-mqtt:1.1.0`
diff --git a/k8s/devicehive/templates/coap-proxy-deployment.yaml b/k8s/devicehive/templates/coap-proxy-deployment.yaml
new file mode 100644
index 0000000..88d7474
--- /dev/null
+++ b/k8s/devicehive/templates/coap-proxy-deployment.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.coapProxy.enabled }}
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}-devicehive-coap-proxy
+  labels:
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    component: "coap-proxy"
+    heritage: "{{ .Release.Service }}"
+    release: "{{ .Release.Name }}"
+spec:
+  replicas: {{ .Values.coapProxy.replicaCount }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}-devicehive-coap-proxy
+    spec:
+      serviceAccountName: {{ if .Values.rbac.create }}{{ template "devicehive.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
+      containers:
+      - name: coap-proxy
+        image: {{ .Values.coapProxy.image | quote }}
+        imagePullPolicy: {{ .Values.coapProxy.pullPolicy }}
+        env:
+        - name: ENVSEPARATOR
+          value: "_"
+        - name: PROXY_HOST
+          value: 0.0.0.0
+        - name: PROXY_PORT
+          value: "5683"
+        - name: PROXY_TARGET
+          value: "ws://{{ .Release.Name }}-devicehive-frontend:8080/api/websocket"
+        ports:
+        - name: coap
+          protocol: UDP
+          containerPort: 5683
+        resources:
+{{ toYaml .Values.coapProxy.resources | indent 10 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+{{- end }}
diff --git a/k8s/devicehive/templates/coap-proxy-service.yaml b/k8s/devicehive/templates/coap-proxy-service.yaml
new file mode 100644
index 0000000..0a9cdc7
--- /dev/null
+++ b/k8s/devicehive/templates/coap-proxy-service.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.coapProxy.enabled }}
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ .Release.Name }}-devicehive-coap-proxy
+spec:
+  selector:
+    app: {{ .Release.Name }}-devicehive-coap-proxy
+  type: {{ .Values.coapProxy.service.type }}
+  ports:
+    - protocol: UDP
+      port: {{ .Values.coapProxy.service.port | int }}
+      targetPort: coap
+{{- end }}
diff --git a/k8s/devicehive/values.yaml b/k8s/devicehive/values.yaml
index 7d82305..35acd0a 100644
--- a/k8s/devicehive/values.yaml
+++ b/k8s/devicehive/values.yaml
@@ -52,6 +52,16 @@ backendNode:
   replicaCount: 1
   resources: {}
 
+coapProxy:
+  enabled: false
+  image: devicehive/devicehive-coap-proxy:1.0.0
+  pullPolicy: IfNotPresent
+  replicaCount: 1
+  resources: {}
+  service:
+    type: ClusterIP
+    port: 5683
+
 mqttBroker:
   enabled: false
   image: devicehive/devicehive-mqtt:1.1.0

From 7c189b9dad4d51b9f60d2275e3ad9f6b8f78014c Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Fri, 15 Jun 2018 17:46:14 +0300
Subject: [PATCH 08/17] k8s: fix env var in MQTT broker deployment

---
 k8s/devicehive/templates/mqtt-broker-deployment.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/k8s/devicehive/templates/mqtt-broker-deployment.yaml b/k8s/devicehive/templates/mqtt-broker-deployment.yaml
index 5279c3e..9b3d969 100644
--- a/k8s/devicehive/templates/mqtt-broker-deployment.yaml
+++ b/k8s/devicehive/templates/mqtt-broker-deployment.yaml
@@ -32,7 +32,6 @@ spec:
         - name: BROKER_REDIS_SERVER_PORT
           value: "6379"
         - name: BROKER_APP_LOG_LEVEL
-          value: "debug"
           value: {{ .Values.mqttBroker.appLogLevel | quote }}
         - name: BROKER_WS_SERVER_URL
           value: "{{ .Release.Name }}-devicehive-frontend:8080/api/websocket"

From 7ac73470c4c4fab3f553dc54f9ee6514feda9861 Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Tue, 26 Jun 2018 15:38:00 +0300
Subject: [PATCH 09/17] k8s: remove separate switch for deploying external WS
 proxy

---
 CHANGELOG.md                                  |  1 +
 k8s/devicehive/README.md                      | 42 ++++++++++++++-----
 .../ws-proxy-external-deployment.yaml         |  2 +-
 k8s/devicehive/values.yaml                    |  1 -
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f70428..bda6fff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Change env vars setup for deployments. Setup only necessary vars for choosen bus type
 * Documentation updates
 * Add CoAP-WebSockets proxy deployment and service in chart
+* Remove separate switch for deploying external WebSocket proxy. It is requred for Plugin management service and must be deployed if it is enabled.
 
 ### Docker Compose
 * Add compose file for CoAP-WebSockets proxy
diff --git a/k8s/devicehive/README.md b/k8s/devicehive/README.md
index f36358c..5954c82 100644
--- a/k8s/devicehive/README.md
+++ b/k8s/devicehive/README.md
@@ -40,15 +40,16 @@ Default DeviceHive admin user has name `dhadmin` and password `dhadmin_#911`.
 ### Service endpoints
 Table below lists endpoints where you can find various DeviceHive services. If `ingress` set to `true`, replace *localhost* with hostname(s) used in `ingress.hosts` parameter.
 
-| Service              | URL                               | Notes                        |
-|----------------------|-----------------------------------|------------------------------|
-| Admin Console        | http://*localhost*/admin          |                              |
-| Frontend service API | http://*localhost*/api/rest       |                              |
-| Auth service API     | http://*localhost*/auth/rest      |                              |
-| Plugin service API   | http://*localhost*/plugin/rest    | If enabled, see [Run with DeviceHive Plugin Service](#run-with-devicehive-plugin-service) section below |
-| Frontend Swagger     | http://*localhost*/api/swagger    |                              |
-| Auth Swagger         | http://*localhost*/auth/swagger   |                              |
-| Plugin Swagger       | http://*localhost*/plugin/swagger | If Plugin service is enabled |
+| Service                       | URL                               | Notes                        |
+|-------------------------------|-----------------------------------|------------------------------|
+| Admin Console                 | http://*localhost*/admin          |                              |
+| Frontend service API          | http://*localhost*/api/rest       |                              |
+| Auth service API              | http://*localhost*/auth/rest      |                              |
+| Plugin management service API | http://*localhost*/plugin/rest    | If enabled, see [Install with DeviceHive Plugin Management Service](#install-with-devicehive-plugin-management-service) section below |
+| External WS Proxy for plugins | http://*localhost*/plugin/proxy   | If Plugin service is enabled |
+| Frontend Swagger              | http://*localhost*/api/swagger    |                              |
+| Auth Swagger                  | http://*localhost*/auth/swagger   |                              |
+| Plugin Swagger                | http://*localhost*/plugin/swagger | If Plugin service is enabled |
 
 ## Uninstalling the Chart
 
@@ -62,7 +63,7 @@ The command removes all the Kubernetes components associated with the chart and
 
 ## Configuration
 
-The following tables lists the configurable parameters of the DeviceHive chart and their default values.
+The following table lists the configurable parameters of the DeviceHive chart and their default values.
 
 Parameter | Description | Default
 --------- | ----------- | -------
@@ -128,7 +129,6 @@ Parameter | Description | Default
 `wsProxy.pullPolicy` | DH WS Proxy image pull policy | `IfNotPresent`
 `wsProxy.internal.replicaCount` | Desired number of internal WS Proxy service pods | `1`
 `wsProxy.internal.resources` | Internal WS Proxy service resource requests and limits  | `{}`
-`wsProxy.external.enabled` | If true, External WS Proxy deployment will be created. Requires `javaServer.plugin.enabled` set to `true` | `false`
 `wsProxy.external.replicaCount` | Desired number of external WS Proxy service pods | `1`
 `wsProxy.external.resources` | External WS Proxy service resource requests and limits | `{}`
 `nodeSelector` | Node labels for DeviceHive pods assignment | `{}`
@@ -158,6 +158,26 @@ $ helm install ./devicehive --name my-release -f values.yaml
 
 > **Tip**: You can use the default [values.yaml](devicehive/values.yaml)
 
+### Install with DeviceHive Plugin Management Service
+
+Plugin management service disabled by default. To enable it you need to pass several values to `helm`.
+Change <external_hostname> to hostname pointing to your cluster. For example, if you setup Ingress resource with host 'devicehive.example.com' then pluginConnectUrl will be 'ws://devicehive.example.com/plugin/proxy':
+``` console
+$ helm install \
+  --name my-release
+  --set javaServer.plugin.enabled=true \
+  --set javaServer.plugin.pluginConnectUrl=ws://<external_hostname>/plugin/proxy \
+  ./devicehive
+```
+or with following parameters in values file:
+``` yaml
+javaServer:
+  plugin:
+    enabled: true
+    pluginConnectUrl: ws://<external_hostname>/plugin/proxy
+```
+Enabling Plugin management service automaticaly enables external WebSocket proxy for plugins.
+
 ### RBAC Configuration
 First, Helm itself requires additional configuration to use on Kubernetes clusters where RBAC enabled. Follow instructions in [Helm documentation](https://docs.helm.sh/using_helm/#role-based-access-control).
 
diff --git a/k8s/devicehive/templates/ws-proxy-external-deployment.yaml b/k8s/devicehive/templates/ws-proxy-external-deployment.yaml
index 76ba1d6..c7d585d 100644
--- a/k8s/devicehive/templates/ws-proxy-external-deployment.yaml
+++ b/k8s/devicehive/templates/ws-proxy-external-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.wsProxy.external.enabled }}
+{{- if .Values.javaServer.plugin.enabled -}}
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
diff --git a/k8s/devicehive/values.yaml b/k8s/devicehive/values.yaml
index 35acd0a..7a4ad98 100644
--- a/k8s/devicehive/values.yaml
+++ b/k8s/devicehive/values.yaml
@@ -91,7 +91,6 @@ wsProxy:
     replicaCount: 1
     resources: {}
   external:
-    enabled: false
     replicaCount: 1
     resources: {}
 

From 15ab5c898704a65b673e415f59f249056c203f30 Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Tue, 26 Jun 2018 15:38:42 +0300
Subject: [PATCH 10/17] k8s: add top level Ingress in chart Notes

---
 CHANGELOG.md                       | 1 +
 k8s/devicehive/templates/NOTES.txt | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bda6fff..a39174d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Documentation updates
 * Add CoAP-WebSockets proxy deployment and service in chart
 * Remove separate switch for deploying external WebSocket proxy. It is requred for Plugin management service and must be deployed if it is enabled.
+* Add top level Ingress in chart Notes
 
 ### Docker Compose
 * Add compose file for CoAP-WebSockets proxy
diff --git a/k8s/devicehive/templates/NOTES.txt b/k8s/devicehive/templates/NOTES.txt
index 85bfe21..f486507 100644
--- a/k8s/devicehive/templates/NOTES.txt
+++ b/k8s/devicehive/templates/NOTES.txt
@@ -2,11 +2,14 @@ Thank you for installing {{ .Chart.Name }}.
 
 Your release is named {{ .Release.Name }}.
 
-{{ if .Values.proxy.ingress.enabled -}}
+{{ if .Values.ingress.enabled -}}
+From outside the cluster, DeviceHive Admin Console URL(s) are:
+{{- range .Values.ingress.hosts }}
+http://{{ . }}/admin/
+{{ else if .Values.proxy.ingress.enabled -}}
 From outside the cluster, DeviceHive Admin Console URL(s) are:
 {{- range .Values.proxy.ingress.hosts }}
 http://{{ . }}/admin/
-{{- end }}
 {{- else }}
 Get the DeviceHive Admin Console URL by running these commands in the same shell:
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ .Release.Name }}-devicehive-proxy,component=devicehive-proxy" -o jsonpath="{.items[0].metadata.name}")

From e9cadda8ed83c8ae73c7a778db320adfee866556 Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Fri, 29 Jun 2018 11:15:51 +0300
Subject: [PATCH 11/17] k8s: fixup templating in devicehive chart Notes

---
 k8s/devicehive/templates/NOTES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/k8s/devicehive/templates/NOTES.txt b/k8s/devicehive/templates/NOTES.txt
index f486507..b2ce844 100644
--- a/k8s/devicehive/templates/NOTES.txt
+++ b/k8s/devicehive/templates/NOTES.txt
@@ -6,10 +6,12 @@ Your release is named {{ .Release.Name }}.
 From outside the cluster, DeviceHive Admin Console URL(s) are:
 {{- range .Values.ingress.hosts }}
 http://{{ . }}/admin/
-{{ else if .Values.proxy.ingress.enabled -}}
+{{- end }}
+{{- else if .Values.proxy.ingress.enabled -}}
 From outside the cluster, DeviceHive Admin Console URL(s) are:
 {{- range .Values.proxy.ingress.hosts }}
 http://{{ . }}/admin/
+{{- end }}
 {{- else }}
 Get the DeviceHive Admin Console URL by running these commands in the same shell:
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ .Release.Name }}-devicehive-proxy,component=devicehive-proxy" -o jsonpath="{.items[0].metadata.name}")

From 4fb27cbadfa248d888f72f87b5c521739c0dac6e Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Fri, 29 Jun 2018 12:05:34 +0300
Subject: [PATCH 12/17] k8s: minor update in devicehive chart NOTES

---
 k8s/devicehive/templates/NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s/devicehive/templates/NOTES.txt b/k8s/devicehive/templates/NOTES.txt
index b2ce844..dda0d3d 100644
--- a/k8s/devicehive/templates/NOTES.txt
+++ b/k8s/devicehive/templates/NOTES.txt
@@ -1,4 +1,4 @@
-Thank you for installing {{ .Chart.Name }}.
+Thank you for installing {{ .Chart.Name }} chart.
 
 Your release is named {{ .Release.Name }}.
 

From 6851814e7eb0754e45582398d632de2c79c9152f Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Tue, 10 Jul 2018 23:18:44 +0300
Subject: [PATCH 13/17] k8s: remove leftover from
 .Values.wsProxy.external.enabled

---
 k8s/devicehive/templates/dh-plugin-deployment.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/k8s/devicehive/templates/dh-plugin-deployment.yaml b/k8s/devicehive/templates/dh-plugin-deployment.yaml
index 6acea16..6a2a9f6 100644
--- a/k8s/devicehive/templates/dh-plugin-deployment.yaml
+++ b/k8s/devicehive/templates/dh-plugin-deployment.yaml
@@ -48,10 +48,8 @@ spec:
           value: "{{ .Values.postgresql.postgresUser }}"
         - name: DH_POSTGRES_PASSWORD
           value: "{{ .Values.postgresql.postgresPassword }}"
-{{- if .Values.wsProxy.external.enabled }}
         - name: DH_PROXY_PLUGIN_CONNECT
           value: {{ .Values.javaServer.plugin.pluginConnectUrl | default "ws://localhost/plugin/proxy" | quote }}
-{{- end }}
         - name: DH_ZK_ADDRESS
           value: "{{ .Release.Name }}-zookeeper"
         - name: DH_ZK_PORT

From 8d71f3259a647c3ad6a3fd736e627f91a5e37c1a Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Wed, 11 Jul 2018 14:12:49 +0300
Subject: [PATCH 14/17] k8s: remove another leftover from
 .Values.wsProxy.external.enabled

---
 k8s/devicehive/templates/dh-proxy-locations-configmap.yaml | 2 --
 k8s/devicehive/templates/dh-proxy-upstreams-configmap.yaml | 2 --
 k8s/devicehive/templates/ingress.yaml                      | 2 --
 3 files changed, 6 deletions(-)

diff --git a/k8s/devicehive/templates/dh-proxy-locations-configmap.yaml b/k8s/devicehive/templates/dh-proxy-locations-configmap.yaml
index dfd963e..744305d 100644
--- a/k8s/devicehive/templates/dh-proxy-locations-configmap.yaml
+++ b/k8s/devicehive/templates/dh-proxy-locations-configmap.yaml
@@ -62,8 +62,6 @@ data:
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Real-IP $remote_addr;
     }
-{{- end }}
-{{- if .Values.wsProxy.external.enabled }}
     location /plugin/proxy {
         proxy_redirect off;
         proxy_pass http://wsproxyext/;
diff --git a/k8s/devicehive/templates/dh-proxy-upstreams-configmap.yaml b/k8s/devicehive/templates/dh-proxy-upstreams-configmap.yaml
index 264ff69..927607a 100644
--- a/k8s/devicehive/templates/dh-proxy-upstreams-configmap.yaml
+++ b/k8s/devicehive/templates/dh-proxy-upstreams-configmap.yaml
@@ -14,8 +14,6 @@ data:
     upstream plugin_upstream {
         server {{ .Release.Name }}-devicehive-plugin:8110;
     }
-{{- end }}
-{{- if .Values.wsProxy.external.enabled }}
     upstream wsproxyext {
         server {{ .Release.Name }}-devicehive-ws-proxy-external:3000;
     }
diff --git a/k8s/devicehive/templates/ingress.yaml b/k8s/devicehive/templates/ingress.yaml
index a182765..115a7a5 100644
--- a/k8s/devicehive/templates/ingress.yaml
+++ b/k8s/devicehive/templates/ingress.yaml
@@ -43,8 +43,6 @@ spec:
         backend:
           serviceName: {{ $releaseName }}-devicehive-plugin
           servicePort: 8110
-      {{- end }}
-      {{- if $wsProxyExternalEnabled }}
       - path: /plugin/proxy
         backend:
           serviceName: {{ $releaseName }}-devicehive-ws-proxy-external

From 584cce2d2f4acfcbe90ab7688fa3c38c2e10330a Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Wed, 11 Jul 2018 14:43:50 +0300
Subject: [PATCH 15/17] k8s: and another leftover from
 .Values.wsProxy.external.enabled

---
 k8s/devicehive/templates/ws-proxy-external-service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s/devicehive/templates/ws-proxy-external-service.yaml b/k8s/devicehive/templates/ws-proxy-external-service.yaml
index 8bc48a8..7f25de7 100644
--- a/k8s/devicehive/templates/ws-proxy-external-service.yaml
+++ b/k8s/devicehive/templates/ws-proxy-external-service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.wsProxy.external.enabled }}
+{{- if .Values.javaServer.plugin.enabled -}}
 kind: Service
 apiVersion: v1
 metadata:

From d992024a624c4b65b249f1fb8c45a0a3a85363ef Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Wed, 11 Jul 2018 14:44:59 +0300
Subject: [PATCH 16/17] k8s: finaly get rid of .Values.wsProxy.external.enabled

---
 k8s/devicehive/templates/ingress.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/k8s/devicehive/templates/ingress.yaml b/k8s/devicehive/templates/ingress.yaml
index 115a7a5..ada6f07 100644
--- a/k8s/devicehive/templates/ingress.yaml
+++ b/k8s/devicehive/templates/ingress.yaml
@@ -1,7 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $releaseName := .Release.Name -}}
 {{- $javaServerPluginEnabled := .Values.javaServer.plugin.enabled -}}
-{{- $wsProxyExternalEnabled := .Values.wsProxy.external.enabled -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

From 50d61682ad24aeb5735379903f9edc721199788f Mon Sep 17 00:00:00 2001
From: Alexander Sitnik <alex.sitnik@gmail.com>
Date: Tue, 4 Sep 2018 12:24:28 +0300
Subject: [PATCH 17/17] compose: Add `DEBUG_RMI_HOSTNAME` variable

For setting up JMX debug access via env
---
 CHANGELOG.md               |  1 +
 rdbms-image/README.md      |  2 +-
 rdbms-image/jmx-remote.yml | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a39174d..ee0d3d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Docker Compose
 * Add compose file for CoAP-WebSockets proxy
+* Add `DEBUG_RMI_HOSTNAME` variable for setting up JMX debug access via env
 
 ## 3.5.0 / 2018-06-04
 
diff --git a/rdbms-image/README.md b/rdbms-image/README.md
index 1ffbcc5..0a6337a 100644
--- a/rdbms-image/README.md
+++ b/rdbms-image/README.md
@@ -256,7 +256,7 @@ echo "developer readwrite" > jmxremote.access
 chmod 0400 jmxremote.password
 ```
 
-2. Open `jmx-remote.yml` file and replace `<external hostname>` in _JAVA_OPTIONS env vars with actual hostname of DeviceHive server.
+2. Set `DEBUG_RMI_HOSTNAME` variable (export in environment or add line in .env file) with the actual hostname of DeviceHive server.
 3. Run DeviceHive with the following command:
 ```
 sudo docker-compose -f docker-compose.yml -f jmx-remote.yml
diff --git a/rdbms-image/jmx-remote.yml b/rdbms-image/jmx-remote.yml
index 10a0d41..6eaaeea 100644
--- a/rdbms-image/jmx-remote.yml
+++ b/rdbms-image/jmx-remote.yml
@@ -5,7 +5,7 @@ services:
       - "9999:9999"
       - "10000:10000"
     environment:
-      _JAVA_OPTIONS: "-Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.access.file=/opt/devicehive/jmxremote.access -Dcom.sun.management.jmxremote.password.file=/opt/devicehive/jmxremote.password -Djava.rmi.server.hostname=<external hostname> -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=10000"
+      _JAVA_OPTIONS: "-Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.access.file=/opt/devicehive/jmxremote.access -Dcom.sun.management.jmxremote.password.file=/opt/devicehive/jmxremote.password -Djava.rmi.server.hostname=${DEBUG_RMI_HOSTNAME} -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=10000"
     volumes:
       - ./jmxremote.password:/opt/devicehive/jmxremote.password:ro,z
       - ./jmxremote.access:/opt/devicehive/jmxremote.access:ro,z
@@ -15,7 +15,7 @@ services:
       - "10001:10001"
       - "10002:10002"
     environment:
-      _JAVA_OPTIONS: "-Dcom.sun.management.jmxremote.port=10001 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.access.file=/opt/devicehive/jmxremote.access -Dcom.sun.management.jmxremote.password.file=/opt/devicehive/jmxremote.password -Djava.rmi.server.hostname=<external hostname> -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=10002"
+      _JAVA_OPTIONS: "-Dcom.sun.management.jmxremote.port=10001 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.access.file=/opt/devicehive/jmxremote.access -Dcom.sun.management.jmxremote.password.file=/opt/devicehive/jmxremote.password -Djava.rmi.server.hostname=${DEBUG_RMI_HOSTNAME} -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=10002"
     volumes:
       - ./jmxremote.password:/opt/devicehive/jmxremote.password:ro,z
       - ./jmxremote.access:/opt/devicehive/jmxremote.access:ro,z
@@ -25,7 +25,7 @@ services:
           - "10003:10003"
           - "10004:10004"
         environment:
-          _JAVA_OPTIONS: "-Dcom.sun.management.jmxremote.port=10003 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.access.file=/opt/devicehive/jmxremote.access -Dcom.sun.management.jmxremote.password.file=/opt/devicehive/jmxremote.password -Djava.rmi.server.hostname=<external hostname> -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=10004"
+          _JAVA_OPTIONS: "-Dcom.sun.management.jmxremote.port=10003 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.access.file=/opt/devicehive/jmxremote.access -Dcom.sun.management.jmxremote.password.file=/opt/devicehive/jmxremote.password -Djava.rmi.server.hostname=${DEBUG_RMI_HOSTNAME} -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=10004"
         volumes:
           - ./jmxremote.password:/opt/devicehive/jmxremote.password:ro,z
           - ./jmxremote.access:/opt/devicehive/jmxremote.access:ro,z
@@ -35,7 +35,7 @@ services:
         - "10005:10005"
         - "10006:10006"
       environment:
-        _JAVA_OPTIONS: "-Dcom.sun.management.jmxremote.port=10005 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.access.file=/opt/devicehive/jmxremote.access -Dcom.sun.management.jmxremote.password.file=/opt/devicehive/jmxremote.password -Djava.rmi.server.hostname=<external hostname> -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=10006"
+        _JAVA_OPTIONS: "-Dcom.sun.management.jmxremote.port=10005 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=true -Dcom.sun.management.jmxremote.access.file=/opt/devicehive/jmxremote.access -Dcom.sun.management.jmxremote.password.file=/opt/devicehive/jmxremote.password -Djava.rmi.server.hostname=${DEBUG_RMI_HOSTNAME} -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=10006"
       volumes:
         - ./jmxremote.password:/opt/devicehive/jmxremote.password:ro,z
-        - ./jmxremote.access:/opt/devicehive/jmxremote.access:ro,z
\ No newline at end of file
+        - ./jmxremote.access:/opt/devicehive/jmxremote.access:ro,z