Skip to content

Commit 6feb388

Browse files
Restructure documentation (#156)
* Regrouped documentation to match with EI backend docs * Fix broken links * Updated images with new GUI * Removed html tags intest-rules.md file
1 parent 0a60793 commit 6feb388

18 files changed

+152
-107
lines changed

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ Visit [Eiffel Community](https://eiffel-community.github.io) to get started and
4242

4343
# Documentation
4444

45-
1. [**GUI Overview**](./wiki/markdown/GUI-Overview.md)
46-
1. [**Subscription Handling**](./wiki/markdown/Subscription-Handling.md)
47-
- [**Add Subscription**](./wiki/markdown/Add-Subscription.md)
48-
1. [**Test Rules User Guide**](./wiki/markdown/Test-Rules.md)
45+
1. [**Introduction**](./wiki/markdown/index.md)
46+
1. [**Run in Docker**](./wiki/markdown/docker.md)
47+
1. [**GUI Overview**](./wiki/markdown/GUI-overview.md)
48+
1. [**Subscription Handling**](./wiki/markdown/subscription-handling.md)
49+
- [**Add Subscription**](./wiki/markdown/add-subscription.md)
50+
1. [**Test Rules User Guide**](./wiki/markdown/test-rules.md)
4951
1. [**CURL examples**](./wiki/markdown/curl-examples.md)
50-
1. [**Docker**](./wiki/markdown/docker.md)
52+
53+
**Eiffel Intelligence frontend documentation** [**can be found here**](https://eiffel-community.github.io/eiffel-intelligence-frontend/)

src/main/resources/templates/testRules.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ <h5 class="modal-title">Usage Information</h5>
165165
<div class="modal-body modal-height-fit">
166166
<p id="infoContent" class="pre"></p>
167167
<div class="text-center">
168-
<a href="https://github.com/eiffel-community/eiffel-intelligence-frontend/blob/master/wiki/markdown/Test-Rules.md" target="_blank" rel="noopener noreferrer" style="text-decoration: none;">Test Rules User Guide</a>
168+
<a href="https://github.com/eiffel-community/eiffel-intelligence-frontend/blob/master/wiki/markdown/test-rules.md" target="_blank" rel="noopener noreferrer" style="text-decoration: none;">Test Rules User Guide</a>
169169
</div>
170170
</div>
171171
<div class="modal-footer">
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# GUI Overview
22

3-
Eiffel Intelligence Frontend GUI can be divided into two parts a navigation
3+
Eiffel Intelligence Frontend GUI can be divided into two parts a navigation
44
window and a work window.
55

6-
<img src="images/GUI_subscription_example.png">
6+
<img src="images/subscription_handling.png">
77
</img>
88

9-
As the name suggests, navigation window provides its users one click access to
10-
the resources to interact with EI. This window contains some buttons. Clicking
11-
on any of these buttons result in either opening an interactive form in the
9+
As the name suggests, the navigation bar provides its users one click access to
10+
the resources to interact with EI. This window contains some buttons. Clicking
11+
on any of these buttons result in either opening an interactive form in the
1212
work window or opening a new window with some information resource.
1313

14-
A detailed description of the interactive elements present in the navigation
15-
window and corresponding interactions in the work window is described in the
14+
A detailed description of the interactive elements present in the navigation
15+
window and corresponding interactions in the work window is described in the
1616
following pages.
Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,59 @@
11
# Add Subscription
22

3-
This form is used to add subscription through frontend GUI. Here is a
3+
This form is used to add subscription through frontend GUI. Here is a
44
description of the elements available on this form.
55

6-
**Load Subscription Template:** In this dropdown list options are given to
7-
select a specific template for the subscription form. Currently, the following
8-
options are listed: Jenkins Pipeline Parametrized Job Trigger, REST POST and
6+
<img src="images/add_subscription_form1.png">
7+
</img>
8+
9+
**Load Subscription Template:** In this dropdown list, options are given to
10+
select a specific template for the subscription form. Currently, the following
11+
options are listed: Jenkins Pipeline Parametrized Job Trigger, REST POST and
912
Mail Trigger.
1013

11-
**SubscriptionName:** A field to give a name to the current subscription. Only
14+
**SubscriptionName:** A field to give a name to the current subscription. Only
1215
letters, underscore and numbers are allowed in this field.
1316

14-
**NotificationType:** There are two options: REST POST and
15-
Mail Trigger, depending on how a subscriber want to be notified when a
16-
subscription is fulfilled. If Notification type MAIL is selected an email
17+
**NotificationType:** There are two options: REST POST and
18+
Mail Trigger, depending on how a subscriber want to be notified when a
19+
subscription is fulfilled. If Notification type MAIL is selected an email
1720
subject may be entered, but it is optional.
1821

19-
**RestPostMediaType:** Options for selecting a
20-
specific form content type. The options available in the list depends on the
22+
**RestPostMediaType:** Options for selecting a
23+
specific form content type. The options available in the list depends on the
2124
selected template type.
2225

23-
**NotificationMessage:** It is used to send a message to a specific client. The
24-
format of the message depends on the options selected in the NotificationMessage
25-
and RestPostMediaType. A button, “Add Key/Value pair”, in this field may be
26-
used to add more messages.
27-
28-
**Authorization:** A list to select authorization type. Currently, only one
29-
authorization type is provided which is “BASIC_AUTH”. The option “NO_AUTH”
26+
**NotificationMessage:** It is used to send a message to a specific client. The
27+
format of the message depends on the options selected in the NotificationMessage
28+
and RestPostMediaType. A button, “Add Key/Value pair”, in this field may be
29+
used to add more messages, if the selected RestPostBodyMediaType is FORM/POST
30+
parameters.
31+
32+
**NotificationMeta:** Is the selected subscriber to notify when a subscription
33+
is triggered. It could be an email address such as `example@mail.com` or a url
34+
like `host.com/endpoint`. If you wish to trigger Jenkins job when a subscription
35+
is fulfilled then the url for the job could be set as the notificationMeta.
36+
Parameters such as a Jenkins job-token can be included in this field.
37+
**Note**: The job-token should not be mistaken for the API token that is
38+
used as a password for authentication against the entire jenkins instance.
39+
40+
<img src="images/add_subscription_form2.png">
41+
</img>
42+
43+
**Authorization:** A list to select authorization type. Currently, only one
44+
authorization type is supported, which is “BASIC_AUTH”. The option “NO_AUTH”
3045
implies that authorization is not required.
3146

32-
**Repeat:** It is possible to enable repeat, e.g. whether same subscription
33-
should be re-triggered for new additions to the aggregated object. If disabled,
34-
the notification will be triggered only the first time when conditions are
35-
fulfilled.
36-
37-
**Requirement:** It is used to add a requirement, which need to be fulfilled
38-
before a subscription is triggered. Requirement is added in the form of a
39-
condition (with a specific format). More than one conditions may be added under
40-
one requirement by using “Add Condition” button. It should be noted that
41-
conditions under one requirement are connected by logical “AND”. Thus all
42-
conditions udder one requirement need to be satisfied before a subscription is
43-
triggered. More than one requirements may be added by “Add Requirement” button.
47+
**Repeat:** It is possible to enable repeat, e.g. whether same subscription
48+
should be re-triggered for new additions to the aggregated object. If disabled,
49+
the notification will be triggered only the first time when conditions are
50+
fulfilled.
51+
52+
**Requirement:** It is used to add a requirement, which need to be fulfilled
53+
before a subscription is triggered. Requirement is added in the form of a
54+
condition (with a specific format). More than one conditions may be added under
55+
one requirement by using “Add Condition” button. It should be noted that
56+
conditions under one requirement are connected by logical “AND”. Thus all
57+
conditions udder one requirement need to be satisfied before a subscription is
58+
triggered. More than one requirements may be added by “Add Requirement” button.
4459
Requirements are connected by logical “OR”.

wiki/markdown/curl-examples.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ It is possible to provide both username and password directly in the request, as
6262

6363
curl -X GET -H "Content-type: application/json" -u <user>:<password> localhost:8080/auth/login
6464

65-
More information and examples can be found in the [EI back-end documentation](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/Authentication.md)
65+
More information and examples can be found in the [EI back-end documentation](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/authentication.md)
6666

6767

6868
## <a id="backend" /> /backend
@@ -210,7 +210,7 @@ Note: It is not possible to add the `backendurl` parameter as a JSON parameter.
210210
</tr>
211211
</table>
212212

213-
The EI front-end supports these endpoints. More information can be found in the [EI back-end documentation](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/Download-Files.md)
213+
The EI front-end supports these endpoints. More information can be found in the [EI back-end documentation](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/download-files.md)
214214

215215
#### Some curl examples
216216

@@ -272,7 +272,7 @@ The response is a json object containing all the connected components and data a
272272
</tr>
273273
</table>
274274

275-
Example curl commands to these endpoints [can be found here](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/Query.md) and [here](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/Query-aggregated-objects.md)
275+
Example curl commands to these endpoints [can be found here](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/query.md) and [here](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/query-aggregated-objects.md)
276276

277277

278278
## <a id="rules" />/rules
@@ -301,7 +301,7 @@ The below command would result in a json response of `{"status":true}` if this f
301301
curl -X GET -H "Content-type: application/json" localhost:8080/rules/rule-check/testRulePageEnabled
302302

303303

304-
Example curl commands to these endpoints [can be found here](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/Running-rules-on-objects.md)
304+
Example curl commands to these endpoints [can be found here](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/running-rules-on-objects.md)
305305

306306
## <a id="subscriptions" />/subscriptions
307307

@@ -340,7 +340,7 @@ Example curl commands to these endpoints [can be found here](https://github.com/
340340

341341

342342
The `/subscriptions` endpoint can be called with `GET`, `POST`, `PUT` and `DELETE`.
343-
More information, and examples, on the `/subscriptions` API can be found [here](https://github.com/eiffel-community/eiffel-intelligence/tree/master/wiki/markdown/Subscription-API.md).
343+
More information, and examples, on the `/subscriptions` API can be found [here](https://github.com/eiffel-community/eiffel-intelligence/tree/master/wiki/markdown/subscription-API.md).
344344

345345
A `POST` request with subscriptions in a file may look as the following example.
346346

wiki/markdown/docker.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
# Docker
22

3-
In Eiffel-Intelligence frontend source code a Dockerfile is provided which helps the developer or user to build the local Eiffel-Intellegence frontend source code repository changes to a Docker image.
3+
In Eiffel-Intelligence frontend source code repository, a Dockerfile is provided which helps the developer or user to build the local Eiffel-Intellegence frontend source code repository changes to a Docker image.
44
With the Docker image user can try-out the Eiffel-Intelligence frontend on a Docker Host or in a Kubernetes cluster.
55

66
## Requirements
7-
- Docker
7+
- Docker
88

99

1010
Linux: https://docs.docker.com/install/linux/docker-ce/ubuntu/
1111

12-
12+
1313
Windows: https://docs.docker.com/docker-for-windows/install/
1414

1515
## Follow these step to build the Docker image.
1616

17-
1. Build the Eiffel-Intelligence frontend war file:
18-
`mvn package -DskipTests`
17+
1. Build the Eiffel-Intelligence frontend war file:
18+
`mvn package -DskipTests`
1919

2020

2121
This will produce a war file in the "target" folder.
2222

2323

24-
2. Build the Docker image with the war file that was produced from previous step:
24+
2. Build the Docker image with the war file that was produced from previous step:
2525

2626

27-
`docker build -f src/main/docker/Dockerfile -t eiffel-intelligence-frontend:0.1 .`
27+
`docker build -f src/main/docker/Dockerfile -t eiffel-intelligence-frontend:0.1 .`
2828

2929

3030
Now docker image has build with tag "eiffel-intelligence-frontend:0.1"
3131

3232
## Run Docker image on local Docker Host
33-
To run the produced docker image on the local Docker host, execute this command:
33+
To run the produced docker image on the local Docker host, execute this command:
3434

3535

3636
`docker run -p 8034:8091 --expose 8091 -e server.port=8091 -e logging.level.root=DEBUG -e logging.level.org.springframework.web=DEBUG -e logging.level.com.ericsson.ei=DEBUG eiffel-intelligence-backend:0.1`
@@ -44,8 +44,8 @@ To run the produced docker image on the local Docker host, execute this command:
4444
<B>"-e server.port=8091"</B> - Is the Spring property setting for Eiffel-Intelligence applications web port.
4545

4646

47-
<B>"-e logging.level.root=DEBUG -e logging.level.org.springframework.web=DEBUG -e
48-
logging.level.com.ericsson.ei=DEBUG"</B> - These Spring properties set the logging level for the Eiffel-Intelligence applications.
47+
<B>"-e logging.level.root=DEBUG -e logging.level.org.springframework.web=DEBUG -e
48+
logging.level.com.ericsson.ei=DEBUG"</B> - These Spring properties set the logging level for the Eiffel-Intelligence applications.
4949

5050

5151
It is possible to set all Spring available properties via docker environment "-e" flag. See the application.properties file for all available Eiffel-Intelligence Spring properties.
@@ -68,6 +68,6 @@ When Eiffel-Intelligence container is running on your local Docker host Eiffel-I
6868

6969
In web-browser use url with docker host ip number: "\<docker host ip\>:8091/"
7070

71-
Swich-backend functionality do not work when "localhost" address is used.
71+
Switch-backend functionality do not work when "localhost" address is used.
7272

7373

38 KB
Loading
Binary file not shown.
52.7 KB
Loading
25.1 KB
Loading

0 commit comments

Comments
 (0)