You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2022/10/19 19:40:54 UTC
[incubator-streampipes] 01/01: Merge branch 'STREAMPIPES-598' into STREAMPIPES-597
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-597
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 7deedbfca39b2eee86049212c0a802eae545a94c
Merge: 177f98768 9ececed75
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Oct 19 21:26:58 2022 +0200
Merge branch 'STREAMPIPES-598' into STREAMPIPES-597
.github/workflows/pr-validation.yml | 2 +-
.gitignore | 2 +
create-client-model.sh | 25 +++
pom.xml | 4 +-
.../backend/StreamPipesBackendApplication.java | 13 ++
.../backend/StreamPipesResourceConfig.java | 1 +
streampipes-connect/pom.xml | 5 +
.../elements/SendToBrokerAdapterSink.java | 17 +-
.../container/api/AbstractExtensionsResource.java | 41 +++-
.../api/AbstractPipelineElementResource.java | 35 +---
.../container/api/MonitoringResource.java | 23 ++
.../BaseExtensionsServiceResourceProvider.java | 7 +-
.../container/monitoring/SpMonitoringManager.java | 105 ++++++++++
.../connect/iiot/adapters/PullAdapter.java | 20 +-
.../connect/iiot/adapters/opcua/OpcUaAdapter.java | 6 +-
.../simulator/machine/MachineDataSimulator.java | 3 +-
.../sinks/internal/jvm/datalake/DataLakeSink.java | 6 -
streampipes-maven-plugin/pom.xml | 2 +-
.../streampipes/model/StreamPipesErrorMessage.java | 4 +
.../model/monitoring/MessageCounter.java | 29 ++-
.../model/monitoring/SpEndpointMonitoringInfo.java | 56 +++++
.../streampipes/model/monitoring/SpLogEntry.java | 60 ++++++
.../model/monitoring/SpMetricsEntry.java | 77 +++++++
.../manager/execution/http/HttpRequestBuilder.java | 30 +--
.../manager/matching/DataSetGroundingSelector.java | 14 +-
.../monitoring/pipeline/ExtensionsLogProvider.java | 102 +++++++++
.../pipeline/ExtensionsServiceLogExecutor.java | 81 +++++++
.../pipeline/PipelineExecutionStatusCollector.java | 61 ------
.../monitoring/pipeline/TopicInfoCollector.java | 233 ---------------------
.../streampipes/manager/util/AuthTokenUtils.java | 65 ++++++
.../resource/management/UserResourceManager.java | 8 +
.../management/AdapterResourceManagerTest.java | 7 +-
.../streampipes/rest/api/IPipelineMonitoring.java | 6 +-
.../AbstractMonitoringResource.java} | 17 +-
.../rest/impl/AdapterMonitoringResource.java | 28 +++
.../streampipes/rest/impl/PipelineMonitoring.java | 22 +-
...StreamPipesClientRuntimeConnectionResolver.java | 2 +-
.../user/management/jwt/JwtTokenProvider.java | 3 +-
.../user/management/util/UserInfoUtil.java | 30 ++-
.../standalone/manager/ProtocolManager.java | 10 +-
.../routing/StandaloneSpOutputCollector.java | 18 +-
.../runtime/StandaloneEventProcessorRuntime.java | 14 +-
.../runtime/StandaloneEventSinkRuntime.java | 2 +
.../runtime/StandalonePipelineElementRuntime.java | 14 ++
.../wrapper/context/RuntimeContext.java | 4 +-
.../context/SpEventProcessorRuntimeContext.java | 6 +-
.../wrapper/context/SpEventSinkRuntimeContext.java | 6 +-
.../wrapper/context/SpRuntimeContext.java | 12 +-
.../runtime/EventProcessorRuntimeParams.java | 16 +-
.../params/runtime/EventSinkRuntimeParams.java | 12 +-
ui/cypress/support/utils/DataLakeUtils.ts | 1 +
ui/cypress/tests/adapter/editAdapter.smoke.spec.ts | 2 +-
...g.service.ts => abstract-monitoring.service.ts} | 36 ++--
...ng.service.ts => adapter-monitoring.service.ts} | 31 ++-
.../src/lib/apis/pipeline-monitoring.service.ts | 31 ++-
.../src/lib/model/gen/streampipes-model-client.ts | 2 +-
.../src/lib/model/gen/streampipes-model.ts | 63 +++++-
.../platform-services/src/public-api.ts | 1 +
.../exception-details-dialog.component.ts | 1 -
.../sp-exception-message.component.html | 31 +--
.../sp-exception-message.component.scss | 4 +
.../sp-exception-message.component.ts | 3 +
.../abstract-adapter-details.directive.ts | 66 ++++++
.../adapter-details-logs.component.html | 51 +++++
.../adapter-details-logs.component.scss} | 5 -
.../adapter-details-logs.component.ts | 60 ++++++
.../adapter-details-metrics.component.html | 54 +++++
.../adapter-details-metrics.component.scss} | 5 -
.../adapter-details-metrics.component.ts | 59 ++++++
.../adapter-details-overview.component.html} | 20 +-
.../adapter-details-overview.component.scss} | 5 -
.../adapter-details-overview.component.ts | 50 +++++
.../adapter-details/adapter-details-tabs.ts | 17 +-
.../existing-adapters.component.html | 19 +-
.../existing-adapters.component.ts | 4 +
ui/src/app/connect/connect.module.ts | 28 ++-
ui/src/app/core-ui/core-ui.module.ts | 5 +-
.../status/status-widget.component.css | 0
.../status/status-widget.component.html | 6 +-
.../status/status-widget.component.ts | 7 +-
.../components/model/pipeline-details.model.ts | 5 +
.../monitoring/pipeline-monitoring.component.html | 91 ++++----
.../monitoring/pipeline-monitoring.component.ts | 35 ++--
.../pipeline-element-statistics.component.html | 62 ++----
.../pipeline-element-statistics.component.ts | 104 ++++-----
.../pipeline-logs/pipeline-logs.component.html | 62 ++++++
.../pipeline-logs/pipeline-logs.component.scss | 0
.../pipeline-logs/pipeline-logs.component.ts | 74 +++++++
.../app/pipeline-details/pipeline-details-tabs.ts | 4 +-
.../pipeline-details/pipeline-details.module.ts | 4 +-
ui/src/app/pipelines/pipelines.module.ts | 7 +-
91 files changed, 1757 insertions(+), 724 deletions(-)
diff --cc ui/src/app/connect/connect.module.ts
index a568b12dc,cb247216a..a913d8684
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@@ -114,8 -114,10 +114,10 @@@ import
} from './components/adapter-configuration/adapter-configuration-header/adapter-configuration-header.component';
import { NewAdapterComponent } from './components/new-adapter/new-adapter.component';
import { EditAdapterComponent } from './components/edit-adapter/edit-adapter.component';
+import { EventSchemaErrorHintsComponent } from './components/adapter-configuration/schema-editor/event-schema-error-hints/event-schema-error-hints.component';
-
+ import { SpAdapterDetailsOverviewComponent } from './components/adapter-details/adapter-details-overview/adapter-details-overview.component';
+ import { SpAdapterDetailsLogsComponent } from './components/adapter-details/adapter-details-logs/adapter-details-logs.component';
+ import { SpAdapterDetailsMetricsComponent } from './components/adapter-details/adapter-details-metrics/adapter-details-metrics.component';
-
@NgModule({
imports: [
CoreUiModule,
@@@ -196,12 -211,14 +211,15 @@@
SpEpSettingsSectionComponent,
StartAdapterConfigurationComponent,
FormatItemJsonComponent,
- SpConnectFilterToolbarComponent,
+ SpAdapterDetailsOverviewComponent,
+ SpAdapterDetailsLogsComponent,
+ SpAdapterDetailsMetricsComponent,
SpAdapterOptionsPanelComponent,
- AdapterConfigurationHeaderComponent,
+ SpAdapterTemplateDialogComponent,
+ SpConnectFilterToolbarComponent,
NewAdapterComponent,
- EditAdapterComponent
+ EditAdapterComponent,
+ EventSchemaErrorHintsComponent
],
providers: [
RestService,