From a5265fe1c73c52f57bd65eff1190d27774266edb Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Mon, 22 Mar 2021 14:51:09 -0300 Subject: [PATCH 1/2] feat(wip): add debug template Refs: #38 --- pkg/action/create_instance.go | 4 +- pkg/action/install.go | 15 +- pkg/config/debug_template.go | 1860 +++++++++++++++++++++++++++++++++ pkg/config/load.go | 12 +- pkg/config/root.go | 5 + pkg/config/save.go | 34 +- pkg/install/profile/root.go | 8 + 7 files changed, 1909 insertions(+), 29 deletions(-) create mode 100644 pkg/config/debug_template.go diff --git a/pkg/action/create_instance.go b/pkg/action/create_instance.go index b95e314..52c34f6 100644 --- a/pkg/action/create_instance.go +++ b/pkg/action/create_instance.go @@ -119,7 +119,9 @@ func (i *CreateInstance) Run() (*instance.CreateSiteWhereInstance, error) { if i.ConfigurationTemplate == "" { i.ConfigurationTemplate = defaultConfigurationTemplate } - if i.Minimal { + if i.Debug { + prof = profile.Debug + } else if i.Minimal { prof = profile.Minimal i.ConfigurationTemplate = "minimal" } diff --git a/pkg/action/install.go b/pkg/action/install.go index 37e813a..76139f2 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -19,7 +19,6 @@ package action import ( "context" "fmt" - "github.com/sitewhere/swctl/pkg/install/profile" "io/ioutil" "log" "os" @@ -28,6 +27,8 @@ import ( "sync" "time" + "github.com/sitewhere/swctl/pkg/install/profile" + "gopkg.in/yaml.v2" "github.com/gofrs/flock" @@ -122,8 +123,13 @@ func (i *Install) Run() (*install.SiteWhereInstall, error) { // ConfigurationExists check for swctl configuration file func (i *Install) ConfigurationExists() bool { - _, err := config.LoadConfigurationTemplate(&config.PlaceHolder{}, profile.Default) - return err != config.ErrNotFound + for _, p := range profile.All { + _, err := config.LoadConfigurationTemplate(&config.PlaceHolder{}, p) + if err == config.ErrNotFound { + return false + } + } + return true } // CreateConfiguration Loads the default and minimal configuration @@ -133,6 +139,9 @@ func (i *Install) CreateConfiguration() error { if err = config.CreateMinimalConfiguration(); err != nil { return err } + if err = config.CreateDebugConfiguration(); err != nil { + return err + } return config.CreateDefaultConfiguration() } diff --git a/pkg/config/debug_template.go b/pkg/config/debug_template.go new file mode 100644 index 0000000..b3cdf71 --- /dev/null +++ b/pkg/config/debug_template.go @@ -0,0 +1,1860 @@ +/** + * Copyright © 2014-2021 The SiteWhere Authors + * + * 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. + */ + +package config + +const debugTemplate string = `microservices: +- functionalarea: asset-management + name: Asset Management + description: Provides APIs for managing assets associated with device assignments + icon: devices_other + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8006 + jmxport: 1106 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.asset + level: info + configuration: null +- functionalarea: batch-operations + name: Batch Operations + description: Handles processing of operations which affect a large number of devices + icon: view_module + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8011 + jmxport: 1111 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.batch + level: info + configuration: null +- functionalarea: command-delivery + name: Command Delivery + description: Manages delivery of commands in various formats based on invocation events + icon: call_made + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8012 + jmxport: 1112 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.commands + level: info + configuration: null +- functionalarea: device-management + name: Device Management + description: Provides APIs for managing the device object model + icon: developer_board + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8004 + jmxport: 1104 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.device + level: info + configuration: null +- functionalarea: device-registration + name: Device Registration + description: Handles registration of new devices with the system + icon: add_box + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8013 + jmxport: 1113 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.registration + level: info + configuration: null +- functionalarea: device-state + name: Device State + description: Provides device state management features such as device shadows + icon: warning + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8014 + jmxport: 1114 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.devicestate + level: info + configuration: null +- functionalarea: event-management + name: Event Management + description: Provides APIs for persisting and accessing events generated by devices + icon: dynamic_feed + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8005 + jmxport: 1105 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.event + level: info + configuration: null +- functionalarea: event-sources + name: Event Sources + description: Handles inbound device data from various sources, protocols, and formats + icon: forward + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8008 + jmxport: 1108 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.sources + level: info + configuration: null +- functionalarea: inbound-processing + name: Inbound Processing + description: Common processing logic applied to enrich and direct inbound events + icon: input + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8007 + jmxport: 1107 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.inbound + level: info + configuration: null +- functionalarea: instance-management + name: Instance Management + description: Handles APIs for managing global aspects of an instance + icon: language + replicas: 1 + multitenant: false + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 8080 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + - name: http-rest + protocol: TCP + appprotocol: null + port: 8080 + targetport: + type: 0 + intval: 8080 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8001 + jmxport: 1101 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.instance + level: info + - logger: com.sitewhere.web + level: info + configuration: + raw: + - 123 + - 34 + - 117 + - 115 + - 101 + - 114 + - 77 + - 97 + - 110 + - 97 + - 103 + - 101 + - 109 + - 101 + - 110 + - 116 + - 34 + - 58 + - 123 + - 34 + - 115 + - 121 + - 110 + - 99 + - 111 + - 112 + - 101 + - 72 + - 111 + - 115 + - 116 + - 34 + - 58 + - 34 + - 115 + - 105 + - 116 + - 101 + - 119 + - 104 + - 101 + - 114 + - 101 + - 45 + - 115 + - 121 + - 110 + - 99 + - 111 + - 112 + - 101 + - 46 + - 115 + - 105 + - 116 + - 101 + - 119 + - 104 + - 101 + - 114 + - 101 + - 45 + - 115 + - 121 + - 115 + - 116 + - 101 + - 109 + - 46 + - 99 + - 108 + - 117 + - 115 + - 116 + - 101 + - 114 + - 46 + - 108 + - 111 + - 99 + - 97 + - 108 + - 34 + - 44 + - 34 + - 115 + - 121 + - 110 + - 99 + - 111 + - 112 + - 101 + - 80 + - 111 + - 114 + - 116 + - 34 + - 58 + - 56 + - 48 + - 56 + - 48 + - 44 + - 34 + - 106 + - 119 + - 116 + - 69 + - 120 + - 112 + - 105 + - 114 + - 97 + - 116 + - 105 + - 111 + - 110 + - 73 + - 110 + - 77 + - 105 + - 110 + - 117 + - 116 + - 101 + - 115 + - 34 + - 58 + - 54 + - 48 + - 125 + - 125 + object: null +- functionalarea: label-generation + name: Label Generation + description: Supports generating labels such as bar codes and QR codes for devices + icon: label + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8009 + jmxport: 1109 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.labels + level: info + configuration: null +- functionalarea: outbound-connectors + name: Outbound Connectors + description: Allows event streams to be delivered to external systems for additional processing + icon: label + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8016 + jmxport: 1116 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.connectors + level: info + configuration: null +- functionalarea: schedule-management + name: Schedule Management + description: Supports scheduling of various system operations + icon: label + replicas: 1 + multitenant: true + podspec: + annotations: {} + name: "" + dockerspec: + registry: {{ .Registry }} + repository: {{ .Repository }} + tag: "debug-{{ .Tag }}" + imagepullpolicy: IfNotPresent + ports: + - name: "" + hostport: 0 + containerport: 9000 + protocol: TCP + hostip: "" + - name: "" + hostport: 0 + containerport: 9090 + protocol: TCP + hostip: "" + env: + - name: sitewhere.config.k8s.name + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.name + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.namespace + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: metadata.namespace + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.k8s.pod.ip + value: "" + valuefrom: + fieldref: + apiversion: v1 + fieldpath: status.podIP + resourcefieldref: null + configmapkeyref: null + secretkeyref: null + - name: sitewhere.config.product.id + value: {{ .InstanceName }} + valuefrom: null + - name: sitewhere.config.keycloak.service.name + value: sitewhere-keycloak-http + valuefrom: null + - name: sitewhere.config.keycloak.api.port + value: "80" + valuefrom: null + - name: sitewhere.config.keycloak.realm + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.realm + value: master + valuefrom: null + - name: sitewhere.config.keycloak.master.username + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.master.password + value: sitewhere + valuefrom: null + - name: sitewhere.config.keycloak.oidc.secret + value: "" + valuefrom: + fieldref: null + resourcefieldref: null + configmapkeyref: null + secretkeyref: + localobjectreference: + name: {{ .InstanceName }} + key: client-secret + optional: null + resources: null + livenessprobe: null + readinessprobe: null + serivcespec: + ports: + - name: grpc-api + protocol: TCP + appprotocol: null + port: 9000 + targetport: + type: 0 + intval: 9000 + strval: "" + nodeport: 0 + - name: http-metrics + protocol: TCP + appprotocol: null + port: 9090 + targetport: + type: 0 + intval: 9090 + strval: "" + nodeport: 0 + type: ClusterIP + debug: + enabled: true + jdwpport: 8018 + jmxport: 1118 + logging: + overrides: + - logger: com.sitewhere + level: info + - logger: com.sitewhere.grpc.client + level: info + - logger: com.sitewhere.microservice.grpc + level: info + - logger: com.sitewhere.microservice.kafka + level: info + - logger: org.redisson + level: info + - logger: com.sitewhere.asset + level: info + - logger: com.sitewhere.schedule + level: info + configuration: null +` diff --git a/pkg/config/load.go b/pkg/config/load.go index c112af6..3933b3d 100644 --- a/pkg/config/load.go +++ b/pkg/config/load.go @@ -17,21 +17,23 @@ package config import ( - "github.com/sitewhere/swctl/pkg/install/profile" "io/ioutil" "os" + + "github.com/sitewhere/swctl/pkg/install/profile" ) // LoadConfigurationTemplate loads the configuration template from // ~/swctl/deafult.yaml file. If the files does not exist // it returns the error ErrNotFound func LoadConfigurationTemplate(placeHolder *PlaceHolder, prof profile.SiteWhereProfile) (string, error) { - var configPath string - - if prof == profile.Minimal { + switch prof { + case profile.Minimal: configPath = GetMinimalConfigPath() - } else { + case profile.Debug: + configPath = GetDebugConfigPath() + default: configPath = GetConfigPath() } f, err := os.Open(configPath) diff --git a/pkg/config/root.go b/pkg/config/root.go index 7e9556c..7e893e3 100644 --- a/pkg/config/root.go +++ b/pkg/config/root.go @@ -57,6 +57,11 @@ func GetMinimalConfigPath() string { return filepath.FromSlash(GetConfigHome() + "/minimal.yaml") } +// GetDebugConfigPath returns the path for Debug SiteWhere Control CLI configuration path. +func GetDebugConfigPath() string { + return filepath.FromSlash(GetConfigHome() + "/debug.yaml") +} + // GetConfigHome returns the home directory for the configuration func GetConfigHome() string { home, _ := homedir.Dir() diff --git a/pkg/config/save.go b/pkg/config/save.go index 88ab686..51481df 100644 --- a/pkg/config/save.go +++ b/pkg/config/save.go @@ -22,38 +22,32 @@ import ( // CreateDefaultConfiguration saves the default configuration to the config file func CreateDefaultConfiguration() error { - var err error - configHome := GetConfigHome() - err = os.Mkdir(configHome, 0755) - if err != nil && !os.IsExist(err) { - return err - } - configPath := GetConfigPath() - f, err := os.OpenFile(configPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755) - if err != nil { - return err - } - _, err = f.Write([]byte(defaultTemplate)) - if err1 := f.Close(); err == nil { - err = err1 - } - return err + return createConfiguration(GetConfigPath(), defaultTemplate) } -// CreateDefaultConfiguration saves the default configuration to the config file +// CreateMinimalConfiguration saves the minimal configuration to the config file func CreateMinimalConfiguration() error { + return createConfiguration(GetMinimalConfigPath(), minimalTemplate) +} + +// CreateDebugConfiguration saves the debug configuration to the config file +func CreateDebugConfiguration() error { + return createConfiguration(GetDebugConfigPath(), debugTemplate) +} + +// createConfiguration saves the default configuration to the config file +func createConfiguration(configPath string, templete string) error { var err error configHome := GetConfigHome() err = os.Mkdir(configHome, 0755) if err != nil && !os.IsExist(err) { return err } - minimalConfigPath := GetMinimalConfigPath() - f, err := os.OpenFile(minimalConfigPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755) + f, err := os.OpenFile(configPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755) if err != nil { return err } - _, err = f.Write([]byte(minimalTemplate)) + _, err = f.Write([]byte(templete)) if err1 := f.Close(); err == nil { err = err1 } diff --git a/pkg/install/profile/root.go b/pkg/install/profile/root.go index ce069ba..6524374 100644 --- a/pkg/install/profile/root.go +++ b/pkg/install/profile/root.go @@ -25,4 +25,12 @@ const ( Default SiteWhereProfile = "Default" // Minimal profile, use a reduce set of microservices Minimal SiteWhereProfile = "Minimal" + // Debug profile, use all microservices in debug mode + Debug SiteWhereProfile = "Debug" ) + +var All []SiteWhereProfile = []SiteWhereProfile{ + Default, + Minimal, + Debug, +} From 31a7f225003842a1c7fb1fbbfdedaf79e5ea2f65 Mon Sep 17 00:00:00 2001 From: jorgevillaverde-sitewhere Date: Mon, 22 Mar 2021 15:28:40 -0300 Subject: [PATCH 2/2] feat: add debug template Refs: #38 --- pkg/config/debug_template.go | 390 ++++++++++++++++++++++++++++++--- pkg/config/default_template.go | 26 --- pkg/config/minimal_template.go | 16 -- 3 files changed, 364 insertions(+), 68 deletions(-) diff --git a/pkg/config/debug_template.go b/pkg/config/debug_template.go index b3cdf71..6ed42fb 100644 --- a/pkg/config/debug_template.go +++ b/pkg/config/debug_template.go @@ -42,6 +42,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -125,6 +135,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1106 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8006 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -144,8 +172,6 @@ const debugTemplate string = `microservices: level: info - logger: com.sitewhere.asset level: info - - logger: com.sitewhere.asset - level: info configuration: null - functionalarea: batch-operations name: Batch Operations @@ -172,6 +198,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -255,6 +291,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1111 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8011 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -272,8 +326,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.batch level: info configuration: null @@ -302,6 +354,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -385,6 +447,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1112 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8012 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -402,8 +482,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.commands level: info configuration: null @@ -432,6 +510,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -515,6 +603,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1104 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8004 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -532,8 +638,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.device level: info configuration: null @@ -562,6 +666,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -645,6 +759,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1113 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8013 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -662,8 +794,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.registration level: info configuration: null @@ -692,6 +822,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -775,6 +915,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1114 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8014 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -792,8 +950,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.devicestate level: info configuration: null @@ -822,6 +978,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -905,6 +1071,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1105 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8005 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -922,8 +1106,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.event level: info configuration: null @@ -952,6 +1134,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -1035,6 +1227,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1108 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8008 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -1052,8 +1262,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.sources level: info configuration: null @@ -1082,6 +1290,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -1165,6 +1383,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1107 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8007 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -1182,8 +1418,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.inbound level: info configuration: null @@ -1217,6 +1451,16 @@ const debugTemplate string = `microservices: containerport: 8080 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -1309,6 +1553,24 @@ const debugTemplate string = `microservices: intval: 8080 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1101 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8001 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -1326,8 +1588,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.instance level: info - logger: com.sitewhere.web @@ -1492,6 +1752,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -1575,6 +1845,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1109 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8009 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -1592,8 +1880,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.labels level: info configuration: null @@ -1622,6 +1908,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -1705,6 +2001,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1116 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8016 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -1722,8 +2036,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.connectors level: info configuration: null @@ -1752,6 +2064,16 @@ const debugTemplate string = `microservices: containerport: 9090 protocol: TCP hostip: "" + - name: "tcp-jmx" + hostport: 0 + containerport: 1100 + protocol: TCP + hostip: "" + - name: "tcp-jwdp" + hostport: 0 + containerport: 8000 + protocol: TCP + hostip: "" env: - name: sitewhere.config.k8s.name value: "" @@ -1835,6 +2157,24 @@ const debugTemplate string = `microservices: intval: 9090 strval: "" nodeport: 0 + - name: tcp-jmx + protocol: TCP + appprotocol: null + port: 1118 + targetport: + type: 0 + intval: 1100 + strval: "" + nodeport: 0 + - name: tcp-jwdp + protocol: TCP + appprotocol: null + port: 8018 + targetport: + type: 0 + intval: 8000 + strval: "" + nodeport: 0 type: ClusterIP debug: enabled: true @@ -1852,8 +2192,6 @@ const debugTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.schedule level: info configuration: null diff --git a/pkg/config/default_template.go b/pkg/config/default_template.go index 0d9fb9f..fb3eac1 100644 --- a/pkg/config/default_template.go +++ b/pkg/config/default_template.go @@ -144,8 +144,6 @@ const defaultTemplate string = `microservices: level: info - logger: com.sitewhere.asset level: info - - logger: com.sitewhere.asset - level: info configuration: null - functionalarea: batch-operations name: Batch Operations @@ -272,8 +270,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.batch level: info configuration: null @@ -402,8 +398,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.commands level: info configuration: null @@ -532,8 +526,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.device level: info configuration: null @@ -662,8 +654,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.registration level: info configuration: null @@ -792,8 +782,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.devicestate level: info configuration: null @@ -922,8 +910,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.event level: info configuration: null @@ -1052,8 +1038,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.sources level: info configuration: null @@ -1182,8 +1166,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.inbound level: info configuration: null @@ -1326,8 +1308,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.instance level: info - logger: com.sitewhere.web @@ -1592,8 +1572,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.labels level: info configuration: null @@ -1722,8 +1700,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.connectors level: info configuration: null @@ -1852,8 +1828,6 @@ const defaultTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.schedule level: info configuration: null diff --git a/pkg/config/minimal_template.go b/pkg/config/minimal_template.go index 87b4ba5..50cbee9 100644 --- a/pkg/config/minimal_template.go +++ b/pkg/config/minimal_template.go @@ -144,8 +144,6 @@ const minimalTemplate string = `microservices: level: info - logger: com.sitewhere.asset level: info - - logger: com.sitewhere.asset - level: info configuration: null - functionalarea: command-delivery name: Command Delivery @@ -272,8 +270,6 @@ const minimalTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.commands level: info configuration: null @@ -402,8 +398,6 @@ const minimalTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.device level: info configuration: null @@ -532,8 +526,6 @@ const minimalTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.event level: info configuration: null @@ -662,8 +654,6 @@ const minimalTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.sources level: info configuration: null @@ -792,8 +782,6 @@ const minimalTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.inbound level: info configuration: null @@ -936,8 +924,6 @@ const minimalTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.instance level: info - logger: com.sitewhere.web @@ -1202,8 +1188,6 @@ const minimalTemplate string = `microservices: level: info - logger: org.redisson level: info - - logger: com.sitewhere.asset - level: info - logger: com.sitewhere.connectors level: info configuration: null