Commit 0f28a767 authored by Anna Wyszomirska's avatar Anna Wyszomirska
Browse files

Merge pull request #53 in MEL/melodic-frontend from MEL-1094-redirection-to-kibana-in-ui to rc3.0

* commit '2f735635':
  kibanaUrl in appConfig.json
  button for redirection to Kibana
parents 13d42aa0 2f735635
......@@ -3,4 +3,5 @@ export interface AppConfig {
camundaUrl: string;
grafanaUrl: string;
webSshUrl: string;
kibanaUrl: string;
}
......@@ -36,6 +36,7 @@ export class AppConfigService {
camundaUrl = environment.camundaUrl;
grafanaUrl = environment.grafanaUrl;
webSshUrl = environment.webSshUrl;
kibanaUrl = environment.kibanaUrl;
}();
resolve();
}
......
......@@ -68,3 +68,7 @@ mat-grid-list {
.full-height {
height: 100%;
}
.monitoring-button {
margin-right: var(--triple-margin);
}
<mat-card id="main-process-mat-card">
<button button mat-raised-button color="primary" (click)="onAdvancedViewClick()">
<button button mat-raised-button color="primary" (click)="onAdvancedViewClick()" class="monitoring-button">
<mat-icon class="mat-18">developer_board</mat-icon>
Advanced view
</button>
<button button mat-raised-button color="primary" (click)="onComponentsLogsClick()">
<mat-icon class="mat-18">data_usage</mat-icon>
Components logs
</button>
<button button mat-raised-button color="primary"
class="button-on-right-side" (click)="onProcessesHistoryClick()">
<mat-icon class="mat-18">history</mat-icon>
......
......@@ -10,6 +10,7 @@ import {ActiveProcessListComponent} from '../active-process-list/active-process-
import {CpSolutionViewComponent} from '../cp-solution-view/cp-solution-view.component';
import {CpVariablesViewComponent} from '../cp-variables-view/cp-variables-view.component';
import {DeploymentDifferenceComponent} from '../deployment-difference/deployment-difference.component';
import {AppConfigService} from '../../app-config/service/app-config.service';
@Component({
selector: 'app-process-view',
......@@ -103,6 +104,11 @@ export class ProcessViewComponent implements OnInit, AfterViewInit, OnDestroy {
this.router.navigate(['/process/camunda']);
}
onComponentsLogsClick() {
console.log(`Click for Kibana redirection`);
window.open(AppConfigService.settings.kibanaUrl);
}
onProcessesHistoryClick() {
console.log('History of processes click');
this.router.navigate(['/process/list']);
......
......@@ -2,5 +2,6 @@
"apiUrl": "${API_URL}",
"camundaUrl": "${CAMUNDA_URL}",
"grafanaUrl": "${GRAFANA_URL}",
"webSshUrl": "${WEBSSH_URL}"
"webSshUrl": "${WEBSSH_URL}",
"kibanaUrl": "${KIBANA_URL}"
}
......@@ -2,8 +2,9 @@ export const environment = {
production: true,
useRuntimeConfig: true,
href: '/',
apiUrl: 'http://gui-backend:8078',
apiUrl: 'https://gui-backend:8078',
camundaUrl: 'http://gui-backend:8095',
grafanaUrl: 'http://gui-backend:3000',
webSshUrl: 'http://gui-backend:2121'
webSshUrl: 'https://gui-backend:4433',
kibanaUrl: 'http://gui-backend:5601'
};
......@@ -6,10 +6,11 @@ export const environment = {
production: false,
useRuntimeConfig: false,
href: '/',
apiUrl: 'http://localhost:8078',
apiUrl: 'https://localhost:8078',
camundaUrl: 'http://localhost:8095',
grafanaUrl: 'http://localhost:3000',
webSshUrl: 'http://localhost:2121'
webSshUrl: 'https://localhost:4433',
kibanaUrl: 'http://localhost:5601'
};
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment