diff --git a/homepage/_packages/cloud2edge/installation.md b/homepage/_packages/cloud2edge/installation.md index 8c930868..9bdc9c4a 100644 --- a/homepage/_packages/cloud2edge/installation.md +++ b/homepage/_packages/cloud2edge/installation.md @@ -65,7 +65,8 @@ To install the Cloud2Edge package using load balancers, run the following comman {% clipboard %} RELEASE=c2e helm install -n $NS --wait --timeout 20m --set hono.useLoadBalancer=true \ - --set hono.kafka.externalAccess.service.type=LoadBalancer \ + --set hono.kafka.externalAccess.broker.service.type=NodePort \ + --set hono.kafka.externalAccess.controller.service.type=NodePort \ --set ditto.nginx.service.type=LoadBalancer $RELEASE eclipse-iot/cloud2edge {% endclipboard %} {% endvariant %} diff --git a/homepage/_packages/cloud2edge/tour.md b/homepage/_packages/cloud2edge/tour.md index 9141ea90..ddc710bd 100644 --- a/homepage/_packages/cloud2edge/tour.md +++ b/homepage/_packages/cloud2edge/tour.md @@ -69,7 +69,7 @@ echo $DITTO_API_BASE_URL {% endclipboard %} prints out the URL where to access the Ditto UI and Ditto API documentation. -In the Ditto UI, click on the `Environments` link at the top and then the `Environment JSON` tab. Clicking on "Edit" lets you enter an arbitrary Name (e.g. `default`) +In the Ditto UI, click on the `Environments` link at the top and then the `JSON` tab. Clicking on "Create" lets you enter an arbitrary Name (e.g. `default`) and below a JSON value, to be taken from the output of the following command. {% clipboard %} echo $DITTO_UI_ENV_JSON @@ -94,6 +94,16 @@ curl -i -k -u demo-device@org.eclipse.packages.c2e:demo-secret -H 'Content-Type: }' ${HTTP_ADAPTER_BASE_URL:?}/telemetry {% endclipboard %} +In order to publish the telemetry data via MQTT, the `mosquitto_pub` command can be used: +{% clipboard %} +mosquitto_pub -d -h ${MQTT_ADAPTER_IP} -p ${MQTT_ADAPTER_PORT_MQTTS} -u demo-device@org.eclipse.packages.c2e -P demo-secret ${MOSQUITTO_OPTIONS} -t telemetry -m '{ +"topic": "org.eclipse.packages.c2e/demo-device/things/twin/commands/modify", +"headers": {}, +"path": "/features/temperature/properties/value", +"value": 45 +}' +{% endclipboard %} + ## Retrieving the digital twin's current state The updated state of the digital twin can then be retrieved using: diff --git a/packages/cloud2edge/Chart.yaml b/packages/cloud2edge/Chart.yaml index 92cee0fc..911d1ee5 100644 --- a/packages/cloud2edge/Chart.yaml +++ b/packages/cloud2edge/Chart.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2020 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -11,8 +11,8 @@ # SPDX-License-Identifier: EPL-2.0 # apiVersion: v2 -version: 0.8.0 -appVersion: 0.8.0 +version: 0.9.0 +appVersion: 0.9.0 name: cloud2edge description: | Eclipse IoT Cloud2Edge (C2E) is an integrated suite of services developers can use to build IoT applications @@ -33,8 +33,8 @@ maintainers: email: thomas.jaeckle@bosch.io dependencies: - name: hono - version: ~2.5.6 + version: ~2.6.1 repository: "https://eclipse.org/packages/charts/" - name: ditto - version: ~3.4.0 + version: ~3.5.6 repository: "oci://registry-1.docker.io/eclipse" diff --git a/packages/cloud2edge/README.md b/packages/cloud2edge/README.md index fc9e9b5d..62865787 100644 --- a/packages/cloud2edge/README.md +++ b/packages/cloud2edge/README.md @@ -28,6 +28,13 @@ These profiles can be applied using the `-f` parameter when installing the packa ## Release Notes +### 0.9.0 + +- Use Ditto 3.5.6 chart version. +- Use Hono 2.6.1 chart version. +- When using AMQP messaging via the [profileAmqpMessaging-values.yaml](https://github.com/eclipse/packages/blob/master/packages/cloud2edge/profileAmqpMessaging-values.yaml) profile along with the [profileTracing-values.yaml](https://github.com/eclipse/packages/blob/master/packages/cloud2edge/profileTracing-values.yaml) + profile, there are now combined traces of Hono and Ditto. + ### 0.8.0 - Use Ditto 3.4.0 chart version. diff --git a/packages/cloud2edge/profileAmqpMessaging-values.yaml b/packages/cloud2edge/profileAmqpMessaging-values.yaml index 19bc6c85..e5cc4765 100644 --- a/packages/cloud2edge/profileAmqpMessaging-values.yaml +++ b/packages/cloud2edge/profileAmqpMessaging-values.yaml @@ -19,3 +19,5 @@ hono: amqpMessagingNetworkExample: enabled: true + + useLegacyAmqpTraceContextFormat: false diff --git a/packages/cloud2edge/values.yaml b/packages/cloud2edge/values.yaml index 34b772ef..eec33f17 100644 --- a/packages/cloud2edge/values.yaml +++ b/packages/cloud2edge/values.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2020 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -24,18 +24,21 @@ honoConnection: hono: kafka: - auth: - sasl: - jaas: - clientUsers: - - "hono" - - "ditto-c2e" - clientPasswords: - - "hono-secret" - - "verysecret" + sasl: + client: + users: + - "hono" + - "ditto-c2e" + passwords: + - "hono-secret" + - "verysecret" externalAccess: - service: - type: NodePort + broker: + service: + type: NodePort + controller: + service: + type: NodePort livenessProbeInitialDelaySeconds: 900 readinessProbeInitialDelaySeconds: 45 @@ -170,33 +173,11 @@ ditto: limits: cpu: 250m memory: "512Mi" - # apply workaround for high CPU/memory usage of liveness/readiness check - see https://github.com/bitnami/charts/issues/10264 - # using deprecated 'mongo' executable (still available in mongodb chart 12.x) showing much lower CPU/memory usage; - # needs to be adapted if TLS is enabled - see https://github.com/bitnami/charts/blob/2246e0540e621cd529e32ea2c7c2724c0fbc066a/bitnami/mongodb/templates/standalone/dep-sts.yaml#L285 livenessProbe: - enabled: false - customLivenessProbe: - exec: - command: - - mongo - - --disableImplicitSessions - - --eval - - "db.adminCommand('ping')" - failureThreshold: 6 - initialDelaySeconds: 30 - periodSeconds: 20 - successThreshold: 1 - timeoutSeconds: 10 + initialDelaySeconds: 40 + periodSeconds: 30 + timeoutSeconds: 15 readinessProbe: - enabled: false - customReadinessProbe: - exec: - command: - - sh - - '-c' - - mongo --disableImplicitSessions --eval 'db.hello().isWritablePrimary || db.hello().secondary' | grep -q 'true' - failureThreshold: 6 - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 5 + initialDelaySeconds: 30 + periodSeconds: 15 + timeoutSeconds: 13