From 3dc5b6598d5d60be9a48666255fadb2fc3ae186a Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Tue, 23 Mar 2021 18:20:37 -0400 Subject: [PATCH 1/2] feat: Add pipeline debugging. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 568b6cc..938e6ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sitewhere-admin-ui", - "version": "3.0.2", + "version": "3.0.3", "description": "SiteWhere Administration", "author": "Derek Adams ", "scripts": { @@ -28,7 +28,7 @@ "material-icons": "^0.2.3", "moment": "^2.25.1", "mqtt": "^2.18.8", - "sitewhere-admin-ui-plugins": "3.0.3", + "sitewhere-admin-ui-plugins": "3.0.8", "sockjs-client": "^1.4.0", "source-map-support": "^0.5.19", "universal-analytics": "^0.4.20", @@ -94,4 +94,4 @@ "type": "git", "url": "git+https://github.com/sitewhere/sitewhere-admin-ui.git" } -} \ No newline at end of file +} From 736488bac713302e59da35f4a2736db27ac77ec2 Mon Sep 17 00:00:00 2001 From: Derek Adams Date: Tue, 23 Mar 2021 18:21:28 -0400 Subject: [PATCH 2/2] feat: Add pipeline debugging. --- .../events/EventPipelineLogging.vue | 199 ++++++++++++++++++ src/components/global/GlobalSettings.vue | 24 ++- .../debugging/DebuggingEditor.vue | 51 +++++ .../debugging/PipelineDebuggingDialog.vue | 73 +++++++ .../debugging/PipelineDebuggingFields.vue | 78 +++++++ .../debugging/PipelineDebuggingSection.vue | 78 +++++++ .../infrastructure/InfrastructureEditor.vue | 13 +- .../infrastructure/grpc/GrpcSection.vue | 27 ++- src/components/temp/TenantEnginePlugin.vue | 78 ------- .../TenantEngineConfiguration.vue | 13 +- .../tenants/TenantAdministration.vue | 2 + src/libraries/constants.ts | 19 ++ src/router/index.ts | 5 + yarn.lock | 48 ++--- 14 files changed, 587 insertions(+), 121 deletions(-) create mode 100644 src/components/events/EventPipelineLogging.vue create mode 100644 src/components/global/configuration/debugging/DebuggingEditor.vue create mode 100644 src/components/global/configuration/debugging/PipelineDebuggingDialog.vue create mode 100644 src/components/global/configuration/debugging/PipelineDebuggingFields.vue create mode 100644 src/components/global/configuration/debugging/PipelineDebuggingSection.vue delete mode 100644 src/components/temp/TenantEnginePlugin.vue diff --git a/src/components/events/EventPipelineLogging.vue b/src/components/events/EventPipelineLogging.vue new file mode 100644 index 0000000..3c26a39 --- /dev/null +++ b/src/components/events/EventPipelineLogging.vue @@ -0,0 +1,199 @@ + + + + + \ No newline at end of file diff --git a/src/components/global/GlobalSettings.vue b/src/components/global/GlobalSettings.vue index e010cbe..9077839 100644 --- a/src/components/global/GlobalSettings.vue +++ b/src/components/global/GlobalSettings.vue @@ -17,6 +17,7 @@ @@ -24,7 +27,7 @@ import { IGrpcConfiguration, IKafkaConfiguration, IRedisConfiguration, - IMetricsConfiguration + IMetricsConfiguration, } from "sitewhere-rest-api"; import { ContentDivider } from "sitewhere-ide-components"; @@ -42,8 +45,8 @@ import MetricsSection from "./metrics/MetricsSection.vue"; RedisSection, KafkaSection, GrpcSection, - MetricsSection - } + MetricsSection, + }, }) export default class InfrastructureEditor extends Vue { @Prop() readonly tabkey!: string; @@ -64,6 +67,7 @@ export default class InfrastructureEditor extends Vue { } this.$emit("updated"); } + /** Called when Redis values are updated. */ onRedisUpdated(updated: IRedisConfiguration) { if (this.configuration) { @@ -71,6 +75,7 @@ export default class InfrastructureEditor extends Vue { } this.$emit("updated"); } + /** Called when metrics values are updated. */ onMetricsUpdated(updated: IMetricsConfiguration) { if (this.configuration) { diff --git a/src/components/global/configuration/infrastructure/grpc/GrpcSection.vue b/src/components/global/configuration/infrastructure/grpc/GrpcSection.vue index 7c2198f..b50a1ac 100644 --- a/src/components/global/configuration/infrastructure/grpc/GrpcSection.vue +++ b/src/components/global/configuration/infrastructure/grpc/GrpcSection.vue @@ -10,8 +10,15 @@ name="initial backoff seconds" :value="grpc.initialBackoffSeconds" /> - - + + - + @@ -33,13 +44,13 @@ import GrpcConfigurationDialog from "./GrpcConfigurationDialog.vue"; import { IInstanceConfiguration, IInfrastructureConfiguration, - IGrpcConfiguration + IGrpcConfiguration, } from "sitewhere-rest-api"; import { ContentSection, ContentField, - ContentLink + ContentLink, } from "sitewhere-ide-components"; @Component({ @@ -47,10 +58,10 @@ import { ContentSection, ContentField, ContentLink, - GrpcConfigurationDialog - } + GrpcConfigurationDialog, + }, }) -export default class KafkaSection extends Vue { +export default class GrpcSection extends Vue { @Prop() readonly configuration!: IInstanceConfiguration; @Ref() readonly dialog!: GrpcConfigurationDialog; diff --git a/src/components/temp/TenantEnginePlugin.vue b/src/components/temp/TenantEnginePlugin.vue deleted file mode 100644 index 964177c..0000000 --- a/src/components/temp/TenantEnginePlugin.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - - diff --git a/src/components/tenantengines/TenantEngineConfiguration.vue b/src/components/tenantengines/TenantEngineConfiguration.vue index 0c19b10..a953e0e 100644 --- a/src/components/tenantengines/TenantEngineConfiguration.vue +++ b/src/components/tenantengines/TenantEngineConfiguration.vue @@ -45,6 +45,11 @@ v-else-if="functionalArea == 'inbound-processing'" @dirty="markDirty" /> + >[ path: "devices/:token", component: DeviceDetail }, + { + path: "events", + component: EventPipelineLogging + }, { path: "groups", component: DeviceGroupsList diff --git a/yarn.lock b/yarn.lock index 15cad00..3d9861f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8646,14 +8646,14 @@ single-line-log@^1.1.2: dependencies: string-width "^1.0.1" -sitewhere-admin-ui-plugins@3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/sitewhere-admin-ui-plugins/-/sitewhere-admin-ui-plugins-3.0.3.tgz#67c02dfaa05644d1bec59b4fd42ea103b4f2febc" - integrity sha512-CDe5eWEsDjrQcT2EWxEIUTQwzZ1LYtuDf2HEliY3UmYCuUxdeCyzTsdjgTagVQS48BjkwZvKhxiZeirayzdkXQ== +sitewhere-admin-ui-plugins@3.0.8: + version "3.0.8" + resolved "https://registry.yarnpkg.com/sitewhere-admin-ui-plugins/-/sitewhere-admin-ui-plugins-3.0.8.tgz#601ec628df521d5e200fb11b819560856633907f" + integrity sha512-8Mpxk06QGfHbuKdcXsTMwRzZXz1yAbmIpXCjch9GHn3geCc7XROXAx15J4N4jzuBEeQxywJ0B1riPeWueNStTA== dependencies: axios "0.21.1" - sitewhere-configuration-model "3.0.0" - sitewhere-ide-components "3.0.1" + sitewhere-configuration-model "3.0.1" + sitewhere-ide-components "3.0.3" vue "^2.6.11" vue-class-component "^7.2.3" vue-color "^2.7.1" @@ -8663,27 +8663,27 @@ sitewhere-admin-ui-plugins@3.0.3: vuetify "^2.2.11" vuex "^3.3.0" -sitewhere-configuration-model@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/sitewhere-configuration-model/-/sitewhere-configuration-model-3.0.0.tgz#5ac98c22e4237f6c3fdf8f1f98b42305403dea6e" - integrity sha512-75ktVCzITI9f3zDd/uQFALRC9YFo4nolxSsvsfxl+993QagmgDEqhajwFOHNiyWUKmJhVV66ghvfsiFN3E5lqw== +sitewhere-configuration-model@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sitewhere-configuration-model/-/sitewhere-configuration-model-3.0.1.tgz#1345f9e736af5ec3ae77c121c0546378168be305" + integrity sha512-zSlL5VOznnacq826P+r2A01xx2GSLXeiXicCXQXh6A0bOGWCRdQdI9dJRgTtk4im+3tz0HMYnd7STjTgEEblqA== -sitewhere-ide-common@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/sitewhere-ide-common/-/sitewhere-ide-common-3.0.0.tgz#041b62bf9357c7a5f99e0d0f5229d37010bc4e3f" - integrity sha512-2lDzXW7o6pKltBuJp31zN6HMuocLCOG3g59j1cWE7aNuhzZKKd4U4ggYL5YU+F5kQlDwazLy+ZxDq+bDs89xDQ== +sitewhere-ide-common@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/sitewhere-ide-common/-/sitewhere-ide-common-3.0.2.tgz#b8ff2e1fc0bb5a254494d86ea392a28f82c92765" + integrity sha512-ePe5vnbsf9tKHt6QSaIJb0bQqbp+Uq9rxGnno3BHQAlDeQo1mrX4vvlNZc0IwKNIF6evSb9f4HwelgeXfiMd7w== dependencies: axios "0.21.1" moment "^2.25.1" - sitewhere-rest-api "3.0.0" + sitewhere-rest-api "3.0.2" -sitewhere-ide-components@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/sitewhere-ide-components/-/sitewhere-ide-components-3.0.1.tgz#db55273abd391b2e7842a71acc26a77110fea5ab" - integrity sha512-TopvOlRwRRG0lcIGUsLg0TWw9J13Jk4IH2Bvoqi1C1t8f1jiWf8symE4QwsPWnV28o6fgrrMsAScKDdEs02GxQ== +sitewhere-ide-components@3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/sitewhere-ide-components/-/sitewhere-ide-components-3.0.3.tgz#9e05aabc0aafa1e78e7ce6cf7d1468009dc61da4" + integrity sha512-m4yYY4UXNRDh/JVhCHgjalUgsZJWR0GJjV/5Q7tM6qBy4XGxZu1X1a6qK0/2pn2Rhoynt463WgXWdQjBfFeXhw== dependencies: axios "0.21.1" - sitewhere-ide-common "3.0.0" + sitewhere-ide-common "3.0.2" vue "^2.6.11" vue-class-component "^7.2.3" vue-color "^2.7.1" @@ -8693,10 +8693,10 @@ sitewhere-ide-components@3.0.1: vuetify "^2.2.11" vuex "^3.3.0" -sitewhere-rest-api@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/sitewhere-rest-api/-/sitewhere-rest-api-3.0.0.tgz#3652c0fd850098c5785292c96d852ddfe18cc8eb" - integrity sha512-/Csvn/gCn/QQbDU2sBYmTg6htC62AKcMEE35heIsyklkPDHi75azEIWXoh8AmdDuquSQMastaCDfXaFbiHo2GA== +sitewhere-rest-api@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/sitewhere-rest-api/-/sitewhere-rest-api-3.0.2.tgz#ba8a919cd6abb2d633309093618f15eab70ba84d" + integrity sha512-7T4Ao0dCIwMOGLmOAVgiqlWPbBbV2GWXEY46gECGYquLo1rCTKdgHrWhYqmfxpvw6QSAF1TUChh3Fyf4PFR6wg== dependencies: axios "0.21.1"