Gitpod: add names+descriptions to ports (#2600)

.gitpod.yml

@@ -36,29 +36,46 @@ tasks:
     command: odoo -d prod --addons-path=/workspace/odoo/addons-enabled -i base,partner_firstname,web_m2x_options,stock,openems
 
 ports:
-  # Backend
-  - port: 8075 # Backend-to-Backend JSON/REST Api
+  - name: OpenEMS UI
+    description: OpenEMS User-Interface. Login admin:admin
+    port: 4200
+    onOpen: open-browser 
+  - name: OpenEMS Backend - Odoo. Login admin:admin
+    description: Odoo - Open Source ERP und CRM
+    port: 8069
+    onOpen: open-browser
+  - name: OpenEMS Backend - Apache Felix Web Console
+    description: Configure Backend OSGi components via `/system/console/configMgr`
+    port: 8079
     onOpen: ignore
-  - port: 8076 # Backend-to-Backend JSON/Websocket Api
+  - name: OpenEMS Edge - Apache Felix Web Console
+    description: Configure Edge OSGi components via `/system/console/configMgr`
+    port: 8080
     onOpen: ignore
-  - port: 8079 # Apache Felix Web Console
+  - name: OpenEMS Backend - Backend-to-Backend JSON/REST Api
+    description: Cloud-side JSON/REST Api
+    port: 8075
     onOpen: ignore
-  - port: 8081 # Edge-Websocket
+  - name: OpenEMS Backend - Backend-to-Backend JSON/Websocket Api
+    description: Cloud-side JSON/Websocket Api
+    port: 8076
     onOpen: ignore
-  - port: 8082 # UI-Websocket
+  - name: OpenEMS Backend - Odoo XML-RPC Api
+    port: 5432
     onOpen: ignore
-  # Edge
-  - port: 8080 # Apache Felix Web Console
+  - name: OpenEMS Backend - Edge-Websocket
+    description: OpenEMS Edges connect here 
+    port: 8081
     onOpen: ignore
-  - port: 8084 # JSON/REST Api
+  - name: OpenEMS Backend - UI-Websocket
+    description: OpenEMS UIs connect here 
+    port: 8082
     onOpen: ignore
-  - port: 8085 # JSON/Websocket Api
+  - name: OpenEMS Edge - JSON/REST Api
+    description: Local JSON/REST Api
+    port: 8084
     onOpen: ignore
-  # UI
-  - port: 4200
-    onOpen: open-browser
-  # Odoo
-  - port: 8069
-    onOpen: open-browser
-  - port: 5432
+  - name: OpenEMS Edge - JSON/Websocket Api
+    description: Local JSON/Websocket Api
+    port: 8085
     onOpen: ignore

tools/gitpod/openems-backend/config.d/Edge/Websocket.config

@@ -1,3 +1,5 @@
-:org.apache.felix.configadmin.revision:=L"1"
+:org.apache.felix.configadmin.revision:=L"3"
+debugMode="OFF"
+poolSize=I"10"
 port=I"8081"
-service.pid="Edge.Websocket"
+service.pid="Edge.Websocket"

tools/gitpod/openems-backend/config.d/Metadata/Odoo.config

@@ -1,6 +1,15 @@
-:org.apache.felix.configadmin.revision:=L"1"
+:org.apache.felix.configadmin.revision:=L"2"
 database="prod"
-pgUser="gitpod"
-service.pid="Metadata.Odoo"
+debugMode="OFF"
+odooHost="localhost"
 odooPassword="admin"
+odooPort=I"8069"
+odooProtocol="HTTP"
 odooUid=I"2"
+pgConnectionPoolSize=I"40"
+pgHost="localhost"
+pgPassword=""
+pgPort=I"5432"
+pgUser="gitpod"
+poolSize=I"30"
+service.pid="Metadata.Odoo"

tools/gitpod/openems-backend/config.d/Ui/Websocket.config

@@ -1,3 +1,5 @@
-:org.apache.felix.configadmin.revision:=L"1"
+:org.apache.felix.configadmin.revision:=L"2"
+debugMode="OFF"
+poolSize=I"10"
 port=I"8082"
-service.pid="Ui.Websocket"
+service.pid="Ui.Websocket"

tools/gitpod/openems-backend/config.d/org/ops4j/pax/logging.config

@@ -1,3 +1,11 @@
 :org.apache.felix.configadmin.revision:=L"1"
-_felix_.cm.newConfiguration=B"true"
-service.pid="org.ops4j.pax.logging"
+log4j2.appender.console.layout.pattern="%d{ISO8601}\ [%-8.8t]\ %-5p\ [%-30.30c]\ %m%n"
+log4j2.appender.console.layout.type="PatternLayout"
+log4j2.appender.console.name="console"
+log4j2.appender.console.type="Console"
+log4j2.appender.paxosgi.name="paxosgi"
+log4j2.appender.paxosgi.type="PaxOsgi"
+log4j2.rootLogger.appenderRef.console.ref="console"
+log4j2.rootLogger.appenderRef.paxosgi.ref="paxosgi"
+log4j2.rootLogger.level="INFO"
+service.pid="org.ops4j.pax.logging"

tools/gitpod/openems-backend/config.d/org_apache_felix_cm_impl_DynamicBindings.config

@@ -1 +1 @@
-org.ops4j.pax.logging="jar/pax-logging-log4j1-2.0.5.jar"
+org.ops4j.pax.logging="jar/pax-logging-log4j2-2.2.1.jar

tools/gitpod/openems-edge/config.d/Controller/Api/ModbusTcp/ReadOnly/17b969c5-fd9f-4cc3-9fba-fe7f41ff7146.config

@@ -1,5 +1,5 @@
-:org.apache.felix.configadmin.revision:=L"3"
-Component.target="(&(enabled\=true)(!(service.pid\=Controller.Api.ModbusTcp.ReadOnly.17b969c5-fd9f-4cc3-9fba-fe7f41ff7146))(|(id\=_sum)))"
+:org.apache.felix.configadmin.revision:=L"4"
+Component.target="(&(!(service.pid\=Controller.Api.ModbusTcp.ReadOnly.17b969c5-fd9f-4cc3-9fba-fe7f41ff7146))(|(id\=_sum)))"
 _lastChangeAt="2020-09-15T19:21:03"
 _lastChangeBy="UNDEFINED"
 alias=""
@@ -11,4 +11,4 @@ id="ctrlApiModbusTcp0"
 maxConcurrentConnections=I"5"
 port=I"502"
 service.factoryPid="Controller.Api.ModbusTcp.ReadOnly"
-service.pid="Controller.Api.ModbusTcp.ReadOnly.17b969c5-fd9f-4cc3-9fba-fe7f41ff7146"
+service.pid="Controller.Api.ModbusTcp.ReadOnly.17b969c5-fd9f-4cc3-9fba-fe7f41ff7146"

tools/gitpod/openems-edge/config.d/Controller/Symmetric/Balancing/6e15c5d6-3005-49a4-9a96-68fa5f39740f.config

@@ -1,9 +1,11 @@
-:org.apache.felix.configadmin.revision:=L"1"
+:org.apache.felix.configadmin.revision:=L"3"
 alias="Self-consumption\ optimization"
 enabled=B"true"
 ess.id="ess0"
+ess.target="(&(enabled\=true)(!(service.pid\=Controller.Symmetric.Balancing.6e15c5d6-3005-49a4-9a96-68fa5f39740f))(|(id\=ess0)))"
 id="ctrlBalancing0"
 meter.id="meter0"
+meter.target="(&(enabled\=true)(!(service.pid\=Controller.Symmetric.Balancing.6e15c5d6-3005-49a4-9a96-68fa5f39740f))(|(id\=meter0)))"
 service.factoryPid="Controller.Symmetric.Balancing"
 service.pid="Controller.Symmetric.Balancing.6e15c5d6-3005-49a4-9a96-68fa5f39740f"
-targetGridSetpoint=I"0"
+targetGridSetpoint=I"0"

tools/gitpod/openems-edge/config.d/org/ops4j/pax/logging.config

@@ -1,7 +1,11 @@
-:org.apache.felix.configadmin.revision:=L"1"
-log4j.appender.CONSOLE="org.apache.log4j.ConsoleAppender"
-log4j.appender.CONSOLE.layout="org.apache.log4j.PatternLayout"
-log4j.appender.CONSOLE.layout.ConversionPattern="%d{ISO8601}\ [%-8.8t]\ %-5p\ [%-30.30c]\ %m%n"
-log4j.logger.org.eclipse.osgi="WARN"
-log4j.rootLogger="INFO,\ CONSOLE,\ osgi:*"
-service.pid="org.ops4j.pax.logging"
+:org.apache.felix.configadmin.revision:=L"2"
+log4j2.appender.console.layout.pattern="%d{ISO8601}\ [%-8.8t]\ %-5p\ [%-30.30c]\ %m%n"
+log4j2.appender.console.layout.type="PatternLayout"
+log4j2.appender.console.name="console"
+log4j2.appender.console.type="Console"
+log4j2.appender.paxosgi.name="paxosgi"
+log4j2.appender.paxosgi.type="PaxOsgi"
+log4j2.rootLogger.appenderRef.console.ref="console"
+log4j2.rootLogger.appenderRef.paxosgi.ref="paxosgi"
+log4j2.rootLogger.level="INFO"
+service.pid="org.ops4j.pax.logging"

tools/gitpod/openems-edge/config.d/org_apache_felix_cm_impl_DynamicBindings.config

@@ -1 +1 @@
-org.ops4j.pax.logging="jar/pax-logging-log4j1-2.0.5.jar"
+org.ops4j.pax.logging="jar/pax-logging-log4j2-2.2.1.jar"