Skip to content

Commit 74525f7

Browse files
committed
Merge remote-tracking branch 'origin/release/v11.2.3' into release/v11.2.3
2 parents 77b61fd + 232adfd commit 74525f7

5 files changed

Lines changed: 26 additions & 10 deletions

File tree

frontend/src/app/app-management/utm-api-doc/utm-api-doc.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h6 class="card-title mb-0 text-uppercase label-header">
66
<div class="align-items-center">
77
<p class="sw-info">
88
Version:
9-
<app-utm-version-info></app-utm-version-info>
9+
<app-utm-version-info [version]="versionInfo"></app-utm-version-info>
1010
</p>
1111
</div>
1212
</div>
Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
1-
import {Component, OnInit} from '@angular/core';
1+
import {Component, OnDestroy, OnInit} from '@angular/core';
2+
import {Subject} from 'rxjs';
3+
import {takeUntil} from 'rxjs/operators';
4+
import {VersionInfoService} from '../../shared/services/version/version-info.service';
5+
import {AppVersionInfo} from '../../shared/types/updates/updates.type';
26

37
@Component({
48
selector: 'app-utm-api-doc',
59
templateUrl: './utm-api-doc.component.html',
610
styleUrls: ['./utm-api-doc.component.scss']
711
})
8-
export class UtmApiDocComponent implements OnInit {
12+
export class UtmApiDocComponent implements OnInit, OnDestroy {
913

10-
constructor() {
14+
versionInfo: AppVersionInfo;
15+
destroy$ = new Subject<void>();
16+
17+
constructor(private versionTypeService: VersionInfoService) {
1118
}
1219

1320
ngOnInit() {
21+
22+
this.versionTypeService.appVersionInfo$
23+
.pipe(takeUntil(this.destroy$))
24+
.subscribe((versionInfo: AppVersionInfo) => this.versionInfo = versionInfo);
25+
}
26+
27+
ngOnDestroy(): void {
28+
this.destroy$.next();
29+
this.destroy$.complete();
1430
}
1531

1632
}

frontend/src/app/app-module/guides/guide-linux-agent/guide-linux-agent.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,23 @@ export class GuideLinuxAgentComponent implements OnInit {
7878
private loadArchitectures() {
7979
this.architectures = [
8080
{
81-
id: 1, name: 'Ubuntu 16/18/20+',
81+
id: 1, name: 'Ubuntu / Debian',
8282
install: this.getCommandUbuntu('utmstack_agent_service'),
8383
uninstall: this.getUninstallCommand('utmstack_agent_service'),
8484
shell: ''
8585
},
8686
{
87-
id: 2, name: 'Centos 7/Red Hat Enterprise Linux',
87+
id: 2, name: 'Fedora / RedHat',
8888
install: this.getCommandCentos7RedHat('utmstack_agent_service'),
8989
uninstall: this.getUninstallCommand('utmstack_agent_service'),
9090
shell: ''
91-
},
91+
}/*,
9292
{
9393
id: 3, name: 'Centos 8/AlmaLinux',
9494
install: this.getCommandCentos8Almalinux('utmstack_agent_service'),
9595
uninstall: this.getUninstallCommand('utmstack_agent_service'),
9696
shell: ''
97-
}
97+
}*/
9898
];
9999
}
100100
}

frontend/src/app/data-management/alert-management/alert-report-view/alert-report-view.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {HttpResponse} from '@angular/common/http';
22
import {Component, OnInit} from '@angular/core';
33
import {ActivatedRoute} from '@angular/router';
44
import * as moment from 'moment';
5-
import {MAX_SEARCH_RESULTS} from "../../../shared/constants/global.constant";
5+
import {MAX_SEARCH_RESULTS} from '../../../shared/constants/global.constant';
66
import {SortEvent} from '../../../shared/directives/sortable/type/sort-event';
77
import {DataNatureTypeEnum} from '../../../shared/enums/nature-data.enum';
88
import {ElasticDataExportService} from '../../../shared/services/elasticsearch/elastic-data-export.service';

frontend/src/app/shared/constants/global.constant.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ export const ADMIN_DEFAULT_EMAIL = 'admin@localhost';
44
export const DEMO_URL = 'https://demo.utmstack.com/';
55
export const LOG_SOURCE_DASHBOARD_NAME = 'Log source system';
66
export const SAAS_DEFAULT_PASSWORD = 'DefaultPa$$word!';
7-
export const ONLINE_DOCUMENTATION_BASE = 'https://docs.utmstack.com/UTMStackDocumentationSite/';
7+
export const ONLINE_DOCUMENTATION_BASE = 'https://docs.utmstack.com';
88
export const MAX_SEARCH_RESULTS = 10000;
99

0 commit comments

Comments
 (0)