+ [(ngModel)]="filterServices[service.name]">
diff --git a/@overflow/discovery/component/search-result.component.ts b/@overflow/discovery/component/search-result.component.ts
index 9fbcdd9..ce80791 100644
--- a/@overflow/discovery/component/search-result.component.ts
+++ b/@overflow/discovery/component/search-result.component.ts
@@ -1,8 +1,6 @@
import {
Component, Input,
- SimpleChanges,
OnInit,
- OnChanges,
} from '@angular/core';
import { Host, Port, Service } from '@overflow/commons-typescript/model/discovery';
import { TreeNode, Message, Tree } from 'primeng/primeng';
@@ -23,12 +21,11 @@ import { catchError, map, tap, take } from 'rxjs/operators';
InfraRegistService
]
})
-export class SearchResultComponent implements OnInit, OnChanges {
+export class SearchResultComponent implements OnInit {
@Input() probeHost: ProbeHost;
@Input() filterWord: string;
@Input() filterServices: Map
;
- @Input() finished: boolean;
infras: Infra[];
existTargets: Target[];
@@ -62,7 +59,16 @@ export class SearchResultComponent implements OnInit, OnChanges {
children: this.hostNode,
expanded: true
});
- this.getExistTarget();
+ // this.getExistTarget();
+ }
+
+ discoveryStarted(startedAt: Date) {
+ console.log('Discovery Started at: ' + startedAt);
+ }
+
+ discoveryStopped(stoppedAt: Date) {
+ console.log('Discovery Stopped at: ' + stoppedAt);
+ this.saveDiscoveredInfras();
}
getExistTarget() {
@@ -89,11 +95,11 @@ export class SearchResultComponent implements OnInit, OnChanges {
).subscribe();
}
- ngOnChanges(changes: SimpleChanges): void {
- if (changes['finished'] && changes['finished'].currentValue === true) {
- this.saveDiscoveredInfras();
- }
- }
+ // ngOnChanges(changes: SimpleChanges): void {
+ // if (changes['finished'] && changes['finished'].currentValue === true) {
+ // this.saveDiscoveredInfras();
+ // }
+ // }
displayInform() {
this.msgs = [];
@@ -107,9 +113,9 @@ export class SearchResultComponent implements OnInit, OnChanges {
this.hostNode = [];
for (const infra of this.infras) {
switch (infra.metaInfraType) {
- case toMetaInfraType(MetaInfraTypeEnum.ZONE):
- const infraZone: InfraZone = infra;
- break;
+ // case toMetaInfraType(MetaInfraTypeEnum.ZONE):
+ // const infraZone: InfraZone = infra;
+ // break;
case toMetaInfraType(MetaInfraTypeEnum.HOST):
const infraHost: InfraHost = infra;
this.addInfraHost(infraHost);
diff --git a/@overflow/discovery/component2/animation.ts b/@overflow/discovery/component2/animation.ts
new file mode 100644
index 0000000..6d8f3ca
--- /dev/null
+++ b/@overflow/discovery/component2/animation.ts
@@ -0,0 +1,35 @@
+import { trigger, state, transition, style, animate, query, stagger, keyframes } from '@angular/animations';
+
+export const Anim = [
+ trigger('discoveryFilterAnim', [
+ transition('void => *', [
+ query('*', style({ opacity: 0 }), { optional: true }),
+ query('*', stagger('3ms', [
+ animate('0.08s ease-in', keyframes([
+ style({ opacity: 0, transform: 'translateY(-75%)', offset: 0 }),
+ style({ opacity: .5, transform: 'translateY(35px)', offset: 0.3 }),
+ style({ opacity: 1, transform: 'translateY(0)', offset: 1.0 }),
+ ]))]), { optional: true }),
+ ]),
+ // transition('* => void', [
+ // query('*', style({ opacity: 1 }), { optional: true }),
+ // query('*', stagger('5ms', [
+ // animate('0.08s ease-in', keyframes([
+ // style({ opacity: 1, transform: 'translateY(0)', offset: 0 }),
+ // style({ opacity: .5, transform: 'translateY(35px)', offset: 0.3 }),
+ // style({ opacity: 0, transform: 'translateY(-75%)', offset: 1.0 }),
+ // ]))]), { optional: true }),
+ // ])
+ ]),
+ trigger('discoveryResultAnim', [
+ transition('void => *', [
+ query('*', style({ opacity: 0 }), { optional: true }),
+ query('*', stagger('30ms', [
+ animate('0.08s ease-in', keyframes([
+ style({ opacity: 0, transform: 'translateX(-95%)', offset: 0 }),
+ style({ opacity: .5, transform: 'translateX(95px)', offset: 0.3 }),
+ style({ opacity: 1, transform: 'translateX(0)', offset: 1.0 }),
+ ]))]), { optional: true }),
+ ]),
+ ]),
+];
diff --git a/@overflow/discovery/component2/discovery.component.html b/@overflow/discovery/component2/discovery.component.html
new file mode 100644
index 0000000..5902ffc
--- /dev/null
+++ b/@overflow/discovery/component2/discovery.component.html
@@ -0,0 +1,34 @@
+Discovery
+
+
+
+
+
+ Choose a Probe to perform Discovery.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Network Discovery 설명 페이지
+
+
+
\ No newline at end of file
diff --git a/@overflow/discovery/component2/discovery.component.ts b/@overflow/discovery/component2/discovery.component.ts
new file mode 100644
index 0000000..87e2f5c
--- /dev/null
+++ b/@overflow/discovery/component2/discovery.component.ts
@@ -0,0 +1,121 @@
+import {
+ Component, Input, OnDestroy, ViewChild,
+} from '@angular/core';
+
+
+import { Observable, of, Subscription } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+
+import { ProbeHost } from '@overflow/commons-typescript/model/probe';
+import { DiscoverZone, Zone, Host, Port, Service } from '@overflow/commons-typescript/model/discovery';
+
+import { Anim } from './animation';
+import { DiscoveryService } from '../service/discovery.service';
+import { DiscoverySubscriber, DiscoveryNotify } from '../subscriber/discovery.subscriber';
+import { SearchResultComponent } from './search-result.component';
+import { SearchFilterComponent } from './search-filter.component';
+
+@Component({
+ selector: 'of-discovery',
+ templateUrl: './discovery.component.html',
+ animations: Anim,
+})
+export class DiscoveryComponent implements OnDestroy {
+
+ @Input() probeHostID;
+ pending$: Observable;
+ error$: Observable;
+ discoverySubscription: Subscription;
+
+ selectedProbe: ProbeHost;
+ requested: boolean;
+ discoverZone: DiscoverZone;
+
+ filterWord: string;
+ filterServices: Service[];
+
+ startDate: Date;
+ stopDate: Date;
+
+ @ViewChild('discoveryResult') discoveryResult: SearchResultComponent;
+ @ViewChild('discoveryFilter') discoveryFilter: SearchFilterComponent;
+
+ constructor(
+ private discoveryService: DiscoveryService,
+ private discoverySubscriber: DiscoverySubscriber,
+ ) {
+ this.discoverySubscription = null;
+ }
+
+ ngOnDestroy(): void {
+ if (null !== this.discoverySubscription) {
+ this.discoverySubscription.unsubscribe();
+ }
+ }
+
+ onRequestDiscovery(dz: DiscoverZone) {
+ this.requested = true;
+ this.discoverZone = dz;
+
+ const zone: Zone = {
+ network: this.selectedProbe.infraHost.infraZone.network, // this.selectedProbe.probe.cidr
+ address: this.selectedProbe.infraHost.infraZone.address.split('/')[0],
+ iface: this.selectedProbe.infraHost.infraZone.iface,
+ mac: this.selectedProbe.infraHost.infraZone.mac,
+ metaIPType: this.selectedProbe.infraHost.infraZone.metaIPType,
+ };
+
+ this.discoveryService.discoverHost(this.selectedProbe.probe.probeKey, zone, dz.discoverHost);
+
+ this.discoverySubscription = this.discoverySubscriber.observable().pipe(
+ map((discoveryNotify: DiscoveryNotify) => {
+ switch (discoveryNotify.method) {
+ case 'DiscoveryService.discoveryStart': {
+ const startDate = discoveryNotify.params as Date;
+ this.discoveryResult.discoveryStarted(startDate);
+ break;
+ }
+ case 'DiscoveryService.discoveryStop': {
+ const stopDate = discoveryNotify.params as Date;
+ this.discoveryResult.discoveryStopped(stopDate);
+ this.discoverySubscription.unsubscribe();
+ this.discoverySubscription = null;
+ break;
+ }
+ case 'DiscoveryService.discoveredZone': {
+ const _zone = discoveryNotify.params as Zone;
+ break;
+ }
+ case 'DiscoveryService.discoveredHost': {
+ const host = discoveryNotify.params as Host;
+ this.discoveryResult.addHost(host);
+ break;
+ }
+ case 'DiscoveryService.discoveredPort': {
+ const port = discoveryNotify.params as Port;
+ // this.discoveryResult.addPort(port);
+ break;
+ }
+ case 'DiscoveryService.discoveredService': {
+ const service = discoveryNotify.params as Service;
+ this.discoveryFilter.addService(service);
+ this.discoveryResult.addService(service);
+ break;
+ }
+ default: {
+ break;
+ }
+ }
+ }),
+ catchError(error => {
+ return of();
+ }),
+ ).subscribe();
+ }
+
+ onRequestStop() {
+ this.discoverZone = null;
+ this.requested = false;
+ this.discoveryService.stopDiscovery(this.selectedProbe.probe.probeKey);
+ }
+}
diff --git a/@overflow/discovery/component2/index.ts b/@overflow/discovery/component2/index.ts
new file mode 100644
index 0000000..5a4df3a
--- /dev/null
+++ b/@overflow/discovery/component2/index.ts
@@ -0,0 +1,17 @@
+import { ServiceSelectorComponent } from './service-selector.component';
+import { DiscoveryComponent } from './discovery.component';
+import { SearchConfigComponent } from './search-config.component';
+import { SearchFilterComponent } from './search-filter.component';
+import { SearchResultComponent } from './search-result.component';
+import { IpInputComponent } from './ip-input.component';
+import { RequestSummaryComponent } from './request-summary.component';
+
+export const COMPONENTS = [
+ ServiceSelectorComponent,
+ DiscoveryComponent,
+ SearchConfigComponent,
+ SearchFilterComponent,
+ SearchResultComponent,
+ IpInputComponent,
+ RequestSummaryComponent,
+];
diff --git a/@overflow/discovery/component2/ip-input.component.html b/@overflow/discovery/component2/ip-input.component.html
new file mode 100644
index 0000000..c0cf9df
--- /dev/null
+++ b/@overflow/discovery/component2/ip-input.component.html
@@ -0,0 +1,11 @@
+
+ {{title}}
+
+ .
+
+ .
+
+ .
+
+
+
diff --git a/@overflow/discovery/component2/ip-input.component.ts b/@overflow/discovery/component2/ip-input.component.ts
new file mode 100644
index 0000000..f42577c
--- /dev/null
+++ b/@overflow/discovery/component2/ip-input.component.ts
@@ -0,0 +1,57 @@
+import {
+ AfterContentInit,
+ Component,
+ EventEmitter,
+ Input,
+ Output,
+ OnInit,
+} from '@angular/core';
+
+@Component({
+ selector: 'of-ip-input',
+ templateUrl: './ip-input.component.html',
+})
+export class IpInputComponent implements OnInit, AfterContentInit {
+
+ first: string;
+ second: string;
+ third: string;
+ fourth: string;
+
+ @Input() hostIp: string;
+ @Input() title: string;
+ @Input() fixed: number;
+ @Output() inputIp = new EventEmitter();
+
+ constructor(
+ ) {
+ }
+
+ ngOnInit() {
+ if (this.hostIp !== '' && this.hostIp !== null && this.hostIp !== undefined) {
+ const tempIp = this.hostIp.split('.');
+
+ this.first = tempIp[0];
+ this.second = tempIp[1];
+ this.third = tempIp[2];
+ this.fourth = tempIp[3];
+ }
+ }
+
+ ngAfterContentInit() {
+ }
+
+ onIpInput(event) {
+ if (
+ (this.first !== '' && this.first !== undefined) &&
+ (this.second !== '' && this.second !== undefined) &&
+ (this.third !== '' && this.third !== undefined) &&
+ (this.fourth !== '' && this.fourth !== undefined) ) {
+ event.value = this.first + '.' + this.second + '.' + this.third + '.' + this.fourth;
+ this.inputIp.emit(event);
+ } else {
+ return;
+ }
+ }
+
+}
diff --git a/@overflow/discovery/component2/request-summary.component.html b/@overflow/discovery/component2/request-summary.component.html
new file mode 100644
index 0000000..8acc404
--- /dev/null
+++ b/@overflow/discovery/component2/request-summary.component.html
@@ -0,0 +1,24 @@
+
+
+
+
+
+ Port type
+
+ TCP
+ UDP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ipErrMsg}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{portErrMsg}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{node.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Target 지정이 완료되었습니다. 이어서 Sensor를 등록하시면 좋겠다능
+
+
+
+
+
+
\ No newline at end of file
diff --git a/@overflow/discovery/component2/search-result.component.ts b/@overflow/discovery/component2/search-result.component.ts
new file mode 100644
index 0000000..ce80791
--- /dev/null
+++ b/@overflow/discovery/component2/search-result.component.ts
@@ -0,0 +1,348 @@
+import {
+ Component, Input,
+ OnInit,
+} from '@angular/core';
+import { Host, Port, Service } from '@overflow/commons-typescript/model/discovery';
+import { TreeNode, Message, Tree } from 'primeng/primeng';
+import { ProbeHost } from '@overflow/commons-typescript/model/probe';
+import { Anim } from './animation';
+import { TargetService } from '@overflow/target/service/target.service';
+import { InfraService, InfraHost, MetaTargetHostTypeEnum, toMetaTargetHostType, Infra, MetaInfraTypeEnum, toMetaInfraTypeEnum, toMetaInfraType, InfraZone, Target, Page, PageParams } from '@overflow/commons-typescript';
+import { InfraService as InfraRegistService } from '../../infra/service/infra.service';
+import { Observable, of, Subscription } from 'rxjs';
+import { catchError, map, tap, take } from 'rxjs/operators';
+
+@Component({
+ selector: 'of-discovery-result',
+ templateUrl: './search-result.component.html',
+ animations: Anim,
+ providers: [
+ TargetService,
+ InfraRegistService
+ ]
+})
+export class SearchResultComponent implements OnInit {
+
+ @Input() probeHost: ProbeHost;
+ @Input() filterWord: string;
+ @Input() filterServices: Map;
+
+ infras: Infra[];
+ existTargets: Target[];
+
+ discoverySubscription: Subscription;
+ zoneNode: TreeNode[] = [];
+ hostNode: TreeNode[] = [];
+ selectedItems = [];
+ msgs: Message[];
+ error$: Observable;
+
+ discoveredHosts: Host[] = [];
+ discoveredServices: Service[] = [];
+ infraSaved: boolean;
+ targetSaved: boolean;
+
+ pending$: Observable;
+
+ constructor(
+ private infraRegistService: InfraRegistService,
+ private targetService: TargetService
+ ) {
+ }
+
+ ngOnInit(): void {
+ this.zoneNode.push({
+ label: this.probeHost.probe.cidr,
+ type: 'ZONE',
+ data: {
+ },
+ children: this.hostNode,
+ expanded: true
+ });
+ // this.getExistTarget();
+ }
+
+ discoveryStarted(startedAt: Date) {
+ console.log('Discovery Started at: ' + startedAt);
+ }
+
+ discoveryStopped(stoppedAt: Date) {
+ console.log('Discovery Stopped at: ' + stoppedAt);
+ this.saveDiscoveredInfras();
+ }
+
+ getExistTarget() {
+ const pageParams: PageParams = {
+ pageNo: 0,
+ countPerPage: 99999,
+ sortCol: 'id',
+ sortDirection: 'descending'
+ };
+ this.targetService.readAllByProbeID(this.probeHost.probe.id, pageParams)
+ .pipe(
+ tap(() => {
+ }),
+ map((targetPage: Page) => {
+ this.existTargets = targetPage.content;
+ }),
+ catchError(error => {
+ this.error$ = of(error);
+ return of();
+ }),
+ tap(() => {
+ }),
+ take(1),
+ ).subscribe();
+ }
+
+ // ngOnChanges(changes: SimpleChanges): void {
+ // if (changes['finished'] && changes['finished'].currentValue === true) {
+ // this.saveDiscoveredInfras();
+ // }
+ // }
+
+ displayInform() {
+ this.msgs = [];
+ this.msgs.push({
+ severity: 'success',
+ summary: 'Discovery가 완료되었습니다. 모니터링 대상(들)을 선택 후 저장하세요.',
+ });
+ }
+
+ rerenderInfras() {
+ this.hostNode = [];
+ for (const infra of this.infras) {
+ switch (infra.metaInfraType) {
+ // case toMetaInfraType(MetaInfraTypeEnum.ZONE):
+ // const infraZone: InfraZone = infra;
+ // break;
+ case toMetaInfraType(MetaInfraTypeEnum.HOST):
+ const infraHost: InfraHost = infra;
+ this.addInfraHost(infraHost);
+ break;
+ case toMetaInfraType(MetaInfraTypeEnum.SERVICE):
+ const infraService: InfraService = infra;
+ this.addInfraService(infraService)
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ saveDiscoveredInfras() {
+ this.infraRegistService.registDiscoverd(
+ this.probeHost.probe.id,
+ this.discoveredHosts,
+ this.discoveredServices)
+ .pipe(
+ tap(() => {
+ this.infraSaved = false;
+ this.pending$ = of(true);
+ }),
+ map((infras: Infra[]) => {
+ if (infras) {
+ this.infras = infras;
+ this.rerenderInfras();
+ this.displayInform();
+ }
+ }),
+ catchError(error => {
+ this.error$ = of(error);
+ return of();
+ }),
+ tap(() => {
+ this.infraSaved = true;
+ this.pending$ = of(false);
+ }),
+ take(1),
+ ).subscribe();
+ }
+
+ addHost(host: Host) {
+ const idx = this.findHostIndex(host);
+ this.hostNode.splice(idx, 0, {
+ type: 'HOST',
+ label: host.address,
+ data: {
+ ip: this.convertIPtoNumber(host.address),
+ mac: host.mac,
+ target: host
+ },
+ expanded: true,
+ children: []
+ });
+
+ this.discoveredHosts.push(host);
+ }
+
+ addService(service: Service) {
+ const targetHostNode = this.findHostNodeByService(service.port.host.address);
+ const idx = this.findServiceIndex(targetHostNode.children, service.name);
+ targetHostNode.children.splice(idx, 0, {
+ type: 'SERVICE',
+ label: service.name + ' (' + service.port.portNumber + ')',
+ data: {
+ name: service.name,
+ portType: service.port.metaPortType.key,
+ portNumber: service.port.portNumber,
+ target: service
+ },
+ });
+ this.discoveredServices.push(service);
+ }
+
+ addInfraHost(infraHost: InfraHost) {
+ const host: Host = {
+ address: infraHost.infraHostIPs[0].address,
+ }
+ const idx = this.findHostIndex(host);
+ this.hostNode.splice(idx, 0, {
+ type: 'HOST',
+ label: host.address,
+ data: {
+ ip: this.convertIPtoNumber(host.address),
+ target: infraHost
+ },
+ expanded: true,
+ children: []
+ });
+ }
+
+ addInfraService(infraService: InfraService) {
+ const targetHostNode = this.findHostNodeByService(infraService.infraHostPort.infraHostIP.address);
+ const idx = this.findServiceIndex(targetHostNode.children, infraService.metaTargetServiceType.name);
+ targetHostNode.children.splice(idx, 0, {
+ type: 'SERVICE',
+ label: infraService.metaTargetServiceType.name + ' (' + infraService.infraHostPort.port + ')',
+ data: {
+ name: infraService.metaTargetServiceType.name,
+ portType: infraService.infraHostPort.metaPortType.name,
+ portNumber: infraService.infraHostPort.port,
+ target: infraService
+ },
+ });
+ }
+
+
+ onTargetSelect(e, node: TreeNode) {
+ const data = node.data.target;
+ if (e.checked) {
+ this.selectedItems.push(data);
+ } else {
+ const index = this.selectedItems.indexOf(data);
+ this.selectedItems.splice(index, 1);
+ }
+ }
+
+
+ findHostIndex(host: Host): number {
+ let index = 0;
+ this.hostNode.forEach(node => {
+ if (node.data.ip < this.convertIPtoNumber(host.address)) {
+ index++;
+ }
+ });
+ return index;
+ }
+
+ findServiceIndex(serviceNodes: TreeNode[], serviceName: string) {
+ let index = 0;
+ serviceNodes.forEach(node => {
+ // if (node.data.portNumber < service.port.portNumber) {
+ // index++;
+ // }
+ if (node.data.name.toUpperCase().localeCompare(serviceName.toUpperCase()) === -1) {
+ index++;
+ }
+ });
+ return index;
+ }
+
+ findHostNodeByService(serviceAddress: string) {
+ let targetHost = null;
+ this.hostNode.forEach((value, i) => {
+ if (value.data.ip === this.convertIPtoNumber(serviceAddress)) {
+ targetHost = value;
+ return;
+ }
+ });
+ return targetHost;
+ }
+
+ convertIPtoNumber(ip: string) {
+ return ip.split('.').map((octet, index, array) => {
+ return parseInt(octet) * Math.pow(256, (array.length - index - 1));
+ }).reduce((prev, curr) => {
+ return prev + curr;
+ });
+ }
+
+ checkHighlight(label: string, type: number) {
+ let highlight = true;
+ if (this.filterWord && (label.toUpperCase().indexOf(this.filterWord.toUpperCase()) < 0)) {
+ highlight = false;
+ }
+ if (type === 1 && this.filterServices[label] === false) {
+ highlight = false;
+ }
+ return highlight;
+ }
+
+ checkExistTarget(infra: Infra): boolean {
+ if (!this.infraSaved) {
+ return false;
+ }
+ for (const target of this.existTargets) {
+ if (target.infra.id === infra.id) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ saveTargets() {
+ const targets: Target[] = [];
+ this.selectedItems.forEach(value => {
+ const infra: Infra = value;
+ let name: string;
+ if (value.metaInfraType === toMetaInfraType(MetaInfraTypeEnum.ZONE)) {
+ const infraZone: InfraZone = value;
+ name = infraZone.network;
+ } else if (value.metaInfraType === toMetaInfraType(MetaInfraTypeEnum.HOST)) {
+ const infraHost: InfraHost = value;
+ name = infraHost.infraHostIPs[0].address;
+ } else if (value.metaInfraType === toMetaInfraType(MetaInfraTypeEnum.SERVICE)) {
+ const infraService: InfraService = value;
+ name = infraService.metaInfraType.name;
+ }
+
+ const target: Target = {
+ infra: {
+ id: infra.id
+ },
+ name: name,
+ sensorCount: 0,
+ };
+ targets.push(target);
+ });
+ this.targetService.registAll(targets, this.probeHost.probe.id)
+ .pipe(
+ tap(() => {
+ }),
+ map((targets: Target[]) => {
+ if (targets) {
+ this.targetSaved = true;
+ }
+ }),
+ catchError(error => {
+ this.error$ = of(error);
+ return of();
+ }),
+ tap(() => {
+ }),
+ take(1),
+ ).subscribe();
+ }
+
+}
diff --git a/@overflow/discovery/component2/service-selector.component.html b/@overflow/discovery/component2/service-selector.component.html
new file mode 100644
index 0000000..fb92a7b
--- /dev/null
+++ b/@overflow/discovery/component2/service-selector.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ {{rowData.name}}
+ |
+
+
+
+
+