Added publishing of plugin broker logs as runtime logs by sleshchenko · Pull Request #11423 · eclipse-che/che

sleshchenko · 2018-10-01T12:14:10Z

What does this PR do?

The main purpose of this PR is adding publishing of plugin broker logs as runtime logs.
To achieve it there are several commits:

Introduced new event RuntimeLogEvent instead of MachineLogEvent. New event can be used to publish machine related log or machine independent log (like Plugin Broker). There is optional field machineName that indicates whether the event is machine related;
Add RuntimeId to plugin broker events instead of workspace id field. It is needed to publish PluginBrokerEvent as RuntimeLogEvent;
Make Che Server listen to broker log and republish it as runtime log;
Make Workspace Loader listen to runtime log instead of machine log;
Adapt GWT IDE to RuntimeLogEvent changes;

Dashboard is not adapted and it still uses deprecated machine/log JSON RPC method. A separated issue will be created for it.

Here is an example of how:

Workspace Loader displays Plugin Broker logs

Dashboard displays Plugin Broker logs

Minor improvements

to make plugin broker testing easier there is commit that sets Plugin Broker pull policy according to parameter;

What issues does this PR fix or reference?

#11069

Release Notes

N/A

Docs PR

N/A

sleshchenko · 2018-10-01T12:15:03Z

@akurinnoy Please review workspace loader related changes 6b8166d
@azatsarynnyy Please review GWT IDE related changes 428ea8e

akurinnoy

LGTM

sleshchenko · 2018-10-01T13:06:22Z

Depends on eclipse-che/che-plugin-broker#12

azatsarynnyy

LGTM

sleshchenko · 2018-10-03T12:45:48Z

@akurinnoy Please validate one more commit in this PR 97c170d

garagatyi · 2018-10-04T09:05:30Z

...pace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/event/BrokerLogEvent.java

+  BrokerLogEvent withTime(String time);
+
+  /** Returns standard streams, if present otherwise, null will be returned. */
+  String getStream();


Since broker doesn't work with RAW commands execution I would recommend to remove it from broker specific logs.

garagatyi

Looks good!

garagatyi · 2018-10-04T10:25:40Z

...g/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/events/BrokerStatusListener.java

  @Override
  public void onEvent(BrokerEvent event) {
-    if (!workspaceId.equals(event.getWorkspaceId())) {
+    if (!workspaceId.equals(event.getRuntimeId().getWorkspaceId())) {


Please, check that runtime is not NULL

garagatyi · 2018-10-04T10:26:19Z

...lipse/che/multiuser/permission/workspace/infra/kubernetes/BrokerServicePermissionFilter.java

      case BROKER_STATUS_CHANGED_METHOD:
      case BROKER_RESULT_METHOD:
-        workspaceId = ((BrokerStatusChangedEvent) params[0]).getWorkspaceId();
+        workspaceId = ((BrokerStatusChangedEvent) params[0]).getRuntimeId().getWorkspaceId();


Please, check that runtimeId is not NULL

sleshchenko · 2018-10-04T11:08:57Z

ci-test

riuvshin · 2018-10-04T11:37:56Z

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:11423
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

sleshchenko · 2018-10-04T12:00:55Z

ci-test

riuvshin · 2018-10-04T14:51:51Z

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:11423
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

sleshchenko added the kind/enhancement A feature request - must adhere to the feature request template. label Oct 1, 2018

sleshchenko self-assigned this Oct 1, 2018

sleshchenko requested review from a user, akurinnoy, azatsarynnyy, garagatyi, mshaposhnik and skabashnyuk October 1, 2018 12:14

sleshchenko requested review from l0rd, riuvshin and vparfonov as code owners October 1, 2018 12:14

akurinnoy approved these changes Oct 1, 2018

View reviewed changes

benoitf added the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Oct 1, 2018

azatsarynnyy approved these changes Oct 1, 2018

View reviewed changes

skabashnyuk approved these changes Oct 2, 2018

View reviewed changes

l0rd approved these changes Oct 3, 2018

View reviewed changes

sleshchenko requested review from ashumilova and benoitf as code owners October 3, 2018 12:44

akurinnoy approved these changes Oct 3, 2018

View reviewed changes

garagatyi reviewed Oct 4, 2018

View reviewed changes

garagatyi approved these changes Oct 4, 2018

View reviewed changes

sleshchenko force-pushed the pluginBrokerLogs branch from cfb8b5d to 9f1c5a1 Compare October 4, 2018 10:48

sleshchenko force-pushed the pluginBrokerLogs branch from 9f1c5a1 to 5897e90 Compare October 4, 2018 12:00

sleshchenko added 7 commits October 4, 2018 21:12

Set Plugin Broker pull policy according to parameter

79e2813

Add RuntimeId to plugin broker events instead of workspace id field

6abb78a

Replace MachineLogEvent with more abstract RuntimeLogEvent

a222971

Make Che Server listen to broker log and republish it as runtime log

1e78fa4

Make Workspace Loader listen to runtime log instead of machine log

a11bd54

Adapt GWT IDE to RuntimeLogEvent changes

ef41077

Make Dashboard listen to runtime log instead of machine log

2a1f204

sleshchenko force-pushed the pluginBrokerLogs branch from 5897e90 to 2a1f204 Compare October 4, 2018 18:12

sleshchenko merged commit 5b10f77 into eclipse-che:master Oct 4, 2018

sleshchenko deleted the pluginBrokerLogs branch October 4, 2018 18:13

sleshchenko mentioned this pull request Oct 5, 2018

Fix publishing and logging of plugin broker output eclipse-che/che-plugin-broker#13

Merged

benoitf removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Oct 9, 2018

benoitf added this to the 6.13.0 milestone Oct 9, 2018

Conversation

sleshchenko commented Oct 1, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Minor improvements

What issues does this PR fix or reference?

Release Notes

Docs PR

Uh oh!

sleshchenko commented Oct 1, 2018

Uh oh!

akurinnoy left a comment

Choose a reason for hiding this comment

Uh oh!

sleshchenko commented Oct 1, 2018

Uh oh!

azatsarynnyy left a comment

Choose a reason for hiding this comment

Uh oh!

sleshchenko commented Oct 3, 2018

Uh oh!

garagatyi Oct 4, 2018

Choose a reason for hiding this comment

Uh oh!

garagatyi left a comment

Choose a reason for hiding this comment

Uh oh!

garagatyi Oct 4, 2018

Choose a reason for hiding this comment

Uh oh!

garagatyi Oct 4, 2018

Choose a reason for hiding this comment

Uh oh!

sleshchenko commented Oct 4, 2018

Uh oh!

riuvshin commented Oct 4, 2018

Uh oh!

sleshchenko commented Oct 4, 2018

Uh oh!

riuvshin commented Oct 4, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

sleshchenko commented Oct 1, 2018 •

edited

Loading