Skip to content

S
smart
Commit e5dbde52 authored by wangqinghua's avatar wangqinghua
Browse files
Options

网站监测

parent cddb18b9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 206 additions and 39 deletions
src/main/webapp/app/app.main.module.ts
View file @ e5dbde52
...@@ -61,6 +61,7 @@ import {KonwledgeBaseComponent} from './work/konwledge-base/konwledge-base.compo ...@@ -61,6 +61,7 @@ import {KonwledgeBaseComponent} from './work/konwledge-base/konwledge-base.compo
import {PersonelManageComponent} from './work/personel-manage/personel-manage.component'; import {PersonelManageComponent} from './work/personel-manage/personel-manage.component';
import {WorkHandleComponent} from './work/work-handle/work-handle.component'; import {WorkHandleComponent} from './work/work-handle/work-handle.component';
import {WebsiteComponent} from './modal/website/website.component'; import {WebsiteComponent} from './modal/website/website.component';
import {NetworkDetailComponent} from './overAll/network-check/network-detail/network-detail.component';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -123,6 +124,7 @@ import {WebsiteComponent} from './modal/website/website.component'; ...@@ -123,6 +124,7 @@ import {WebsiteComponent} from './modal/website/website.component';
PersonelManageComponent, PersonelManageComponent,
WorkHandleComponent, WorkHandleComponent,
WebsiteComponent, WebsiteComponent,
NetworkDetailComponent,
], ],
providers:[ providers:[
OverAllService, OverAllService,
......
src/main/webapp/app/modal/website/website.component.ts
View file @ e5dbde52
...@@ -9,11 +9,33 @@ export class WebsiteComponent implements OnInit { ...@@ -9,11 +9,33 @@ export class WebsiteComponent implements OnInit {
isVisible = false; isVisible = false;
title; title;
tabNum = 0;
validateForm;
steps = [];
constructor() { constructor() {
} }
ngOnInit() { ngOnInit() {
this.initForm();
}
initForm(){
this.steps = [];
this.validateForm = {
name:'',
hostid:null,
applicationid:null,
delay:'',
retries:null,
variables:'',
http_proxy:'',
ssl_cert_file:'',
ssl_key_file:'',
ssl_key_password:'',
steps:this.steps,
}
} }
showAddModal() { showAddModal() {
...@@ -32,4 +54,9 @@ export class WebsiteComponent implements OnInit { ...@@ -32,4 +54,9 @@ export class WebsiteComponent implements OnInit {
handleCancel() { handleCancel() {
this.isVisible = false; this.isVisible = false;
} }
tabsChange(index){
this.tabNum = index;
}
} }
src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.ts
View file @ e5dbde52
...@@ -741,6 +741,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit { ...@@ -741,6 +741,7 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
handleImageCancel() { handleImageCancel() {
this.isGrapha = false; this.isGrapha = false;
this.chartOptionGrapha = null;
} }
//监控项分类 //监控项分类
......
src/main/webapp/app/overAll/basic/basic.component.html
View file @ e5dbde52
...@@ -8,18 +8,20 @@ ...@@ -8,18 +8,20 @@
<a>综合监控</a> <a>综合监控</a>
</nz-breadcrumb-item> </nz-breadcrumb-item>
<nz-breadcrumb-item> <nz-breadcrumb-item>
基础资源监控 <a (click)="backList()">基础资源监控</a>
</nz-breadcrumb-item>
<nz-breadcrumb-item *ngIf="searchStatus">
搜索结果
</nz-breadcrumb-item> </nz-breadcrumb-item>
</nz-breadcrumb> </nz-breadcrumb>
</div> </div>
<div nz-col nzSpan="5"> <div nz-col nzSpan="5">
<nz-input-group nzPrefixIcon="anticon anticon-search"> <nz-input-group nzPrefixIcon="anticon anticon-search">
<input type="text" nz-input placeholder="输入资源名称"> <input type="text" nz-input [(ngModel)]="searchName" placeholder="输入资源名称">
</nz-input-group> </nz-input-group>
</div> </div>
<div nz-col nzSpan="3" class="text-right"> <div nz-col nzSpan="3" class="text-right">
<button nz-button nzType="primary"><i class="anticon anticon-search"></i></button> <button (click)="search()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
<button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button> <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
<button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button> <button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>
</div> </div>
...@@ -34,7 +36,7 @@ ...@@ -34,7 +36,7 @@
<span style="margin-right: 8px"> <nz-tag [nzColor]="'#dd4127'"></nz-tag>{{red}} </span> <span style="margin-right: 8px"> <nz-tag [nzColor]="'#dd4127'"></nz-tag>{{red}} </span>
<span> <nz-tag [nzColor]="'#aaaaaa'"></nz-tag>{{gray}} </span> <span> <nz-tag [nzColor]="'#aaaaaa'"></nz-tag>{{gray}} </span>
</span> </span>
<nz-select style="width: 200px;" nzShowSearch nzAllowClear nzPlaceHolder="按组分开" [(ngModel)]="selectedValue" <nz-select style="width: 200px;" nzPlaceHolder="按组分开" [(ngModel)]="selectedValue"
(ngModelChange)="select()"> (ngModelChange)="select()">
<nz-option nzLabel="按设备类型展开" nzValue="type"></nz-option> <nz-option nzLabel="按设备类型展开" nzValue="type"></nz-option>
<nz-option nzLabel="按资源分组展开" nzValue="group"></nz-option> <nz-option nzLabel="按资源分组展开" nzValue="group"></nz-option>
...@@ -53,7 +55,7 @@ ...@@ -53,7 +55,7 @@
</button> </button>
</div> </div>
</div> </div>
<nz-table #nzTable [nzData]="dataSet" nzSingleSort [nzLoading]="loading"> <nz-table #nzTable [nzData]="dataSet" nzSingleSort [nzLoading]="loading" [nzShowPagination]="frontPagination">
<thead> <thead>
<tr> <tr>
<th [nzChecked]="allChecked"></th> <th [nzChecked]="allChecked"></th>
...@@ -66,6 +68,7 @@ ...@@ -66,6 +68,7 @@
</thead> </thead>
<tbody> <tbody>
<ng-container *ngIf="!searchStatus">
<!--设备类型--> <!--设备类型-->
<ng-container *ngIf="selectedValue == 'type'"> <ng-container *ngIf="selectedValue == 'type'">
<ng-template ngFor let-data [ngForOf]="nzTable.data"> <ng-template ngFor let-data [ngForOf]="nzTable.data">
...@@ -214,6 +217,89 @@ ...@@ -214,6 +217,89 @@
</ng-template> </ng-template>
</ng-template> </ng-template>
</ng-container> </ng-container>
</ng-container>
<ng-container *ngIf="searchStatus">
<ng-container *ngFor="let item of searchData">
<tr>
<td nzShowCheckbox [nzIndeterminate]="indeterminate" (nzCheckedChange)="selectChecked($event,item)" [(nzChecked)]="item.checked"></td>
<td class="cursor">
<span (click)="goDetail(item)">{{item.name}}</span>
</td>
<td class="round-tag tag-form">
<nz-tag *ngIf="item.maxLevel == 4 || item.maxLevel == 5" [nzColor]="'#fc0d1b'"></nz-tag>
<nz-tag *ngIf="item.maxLevel == 2 || item.maxLevel == 3" [nzColor]="'#fd9827'"></nz-tag>
<span *ngIf="item.maxLevel < 2">正常</span>
</td>
<td>
<span *ngIf="item.status == 0">已监控</span>
<span *ngIf="item.status == 1">未监控</span>
</td>
<td>
<ng-container *ngIf="item.level">
<ng-container *ngIf="item.available == 0">
<nz-tag>AGENT</nz-tag>
</ng-container>
<ng-container *ngIf="item.available == 1">
<nz-tag [nzColor]="'#3bae6a'">AGENT</nz-tag>
</ng-container>
<ng-container *ngIf="item.available == 2">
<nz-tag [nzColor]="'#d44f51'">AGENT</nz-tag>
</ng-container>
<ng-container *ngIf="item.snmp_available == 0">
<nz-tag>SNMP</nz-tag>
</ng-container>
<ng-container *ngIf="item.snmp_available == 1">
<nz-tag [nzColor]="'#3bae6a'">SNMP</nz-tag>
</ng-container>
<ng-container *ngIf="item.snmp_available == 2">
<nz-tag [nzColor]="'#d44f51'">SNMP</nz-tag>
</ng-container>
<ng-container *ngIf="item.jmx_available == 0">
<nz-tag>JMX</nz-tag>
</ng-container>
<ng-container *ngIf="item.jmx_available == 1">
<nz-tag [nzColor]="'#3bae6a'">JMX</nz-tag>
</ng-container>
<ng-container *ngIf="item.jmx_available == 2">
<nz-tag [nzColor]="'#d44f51'">JMX</nz-tag>
</ng-container>
<ng-container *ngIf="item.ipmi_available == 0">
<nz-tag>IPMI</nz-tag>
</ng-container>
<ng-container *ngIf="item.ipmi_available == 1">
<nz-tag [nzColor]="'#3bae6a'">IPMI</nz-tag>
</ng-container>
<ng-container *ngIf="item.ipmi_available == 2">
<nz-tag [nzColor]="'#d44f51'">IPMI</nz-tag>
</ng-container>
</ng-container>
</td>
<td class="handle">
<span (click)="showBasicCheckModal(item.hostid)">添加监测点</span>
<span (click)="editBasicModal(item)">编辑</span>
<span (click)="showDeleteConfirm(item)">删除</span>
<nz-dropdown [nzTrigger]="'click'" class="table-dropdown">
<a nz-dropdown>更多 <i class="anticon anticon-down"></i>
</a>
<ul nz-menu nzSelectable>
<li (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li>
<li (click)="openHost(item)" nz-menu-item><a>
<ng-container *ngIf="item.status == 1">开启</ng-container>
<ng-container *ngIf="item.status == 0">停止</ng-container>
监控
</a></li>
<li nz-menu-item (click)="goDetail(item)"><a>查看监测点</a></li>
<li (click)="showAlarm(item)" nz-menu-item><a>添加告警</a></li>
</ul>
</nz-dropdown>
</td>
</tr>
</ng-container>
</ng-container>
</tbody> </tbody>
</nz-table> </nz-table>
......
src/main/webapp/app/overAll/basic/basic.component.ts
View file @ e5dbde52
...@@ -44,6 +44,7 @@ export class BasicComponent implements OnInit { ...@@ -44,6 +44,7 @@ export class BasicComponent implements OnInit {
//表格信息 //表格信息
loading = false; loading = false;
frontPagination = true;
selectedValue; selectedValue;
isCheck = false; isCheck = false;
...@@ -65,6 +66,11 @@ export class BasicComponent implements OnInit { ...@@ -65,6 +66,11 @@ export class BasicComponent implements OnInit {
green; green;
gray; gray;
//搜索
searchStatus = false;
searchName;
searchData;
constructor(private fb: FormBuilder, private overAllSer: OverAllService, private router: Router, constructor(private fb: FormBuilder, private overAllSer: OverAllService, private router: Router,
private modalService: NzModalService, private message: NzMessageService, private modalService: NzModalService, private message: NzMessageService,
) { ) {
...@@ -125,6 +131,32 @@ export class BasicComponent implements OnInit { ...@@ -125,6 +131,32 @@ export class BasicComponent implements OnInit {
this.findOpStatus(); this.findOpStatus();
} }
//搜索
search(){
this.loading = true;
this.searchStatus = true;
this.frontPagination = false;
const data = {
search:{
name:this.searchName
}
}
this.overAllSer.find(data).subscribe(
(res)=>{
if(res.errCode == 10000){
this.searchData = res.data;
}
this.loading = false;
}
)
}
//backList
backList(){
this.searchStatus = false;
this.frontPagination = true;
}
//查询设备状态 //查询设备状态
findOpStatus(){ findOpStatus(){
this.overAllSer.findHostCountByStatus(0).subscribe( this.overAllSer.findHostCountByStatus(0).subscribe(
...@@ -194,6 +226,8 @@ export class BasicComponent implements OnInit { ...@@ -194,6 +226,8 @@ export class BasicComponent implements OnInit {
//选择分组 //选择分组
select() { select() {
this.loading = true; this.loading = true;
this.searchStatus = false;
this.frontPagination = true;
if (this.selectedValue == 'group') { if (this.selectedValue == 'group') {
this.overAllSer.getgroups({}).subscribe( this.overAllSer.getgroups({}).subscribe(
(res) => { (res) => {
......
src/main/webapp/app/overAll/network-check/network-check.component.html
View file @ e5dbde52
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</nz-input-group> </nz-input-group>
</div> </div>
<div nz-col nzSpan="3" class="text-right"> <div nz-col nzSpan="3" class="text-right">
<button nz-button nzType="primary"><i class="anticon anticon-search"></i></button> <button (click)="getwebList()" nz-button nzType="primary"><i class="anticon anticon-search"></i></button>
<button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button> <button nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
<button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button> <button nz-button nzType="primary"><i class="anticon anticon-arrows-alt"></i></button>
</div> </div>
...@@ -33,15 +33,9 @@ ...@@ -33,15 +33,9 @@
<span style="margin-right: 8px"> <nz-tag [nzColor]="'#dd4127'"></nz-tag>{{checkStatus.red}} </span> <span style="margin-right: 8px"> <nz-tag [nzColor]="'#dd4127'"></nz-tag>{{checkStatus.red}} </span>
<span> <nz-tag [nzColor]="'#aaaaaa'"></nz-tag>{{checkStatus.gray}} </span> <span> <nz-tag [nzColor]="'#aaaaaa'"></nz-tag>{{checkStatus.gray}} </span>
</span> </span>
<nz-select style="width: 200px;" nzShowSearch nzAllowClear nzPlaceHolder="按组分开" [(ngModel)]="selectedValue"
(ngModelChange)="select()">
<nz-option nzLabel="按设备类型展开" nzValue="type"></nz-option>
<nz-option nzLabel="按资源分组展开" nzValue="group"></nz-option>
</nz-select>
</div> </div>
<div nz-col nzSpan="12" class="text-right"> <div nz-col nzSpan="12" class="text-right">
<button nz-button nzType="default" (click)="showGroupModal()" *ngIf="selectedValue == 'group'"><i <button nz-button nzType="default" (click)="showAddmodal()"><i class="anticon anticon-plus"></i>添加网站
class="anticon anticon-plus"></i>添加网站
</button> </button>
<button (click)="openBatchHost(1,'关闭')" nz-button nzType="default"><i <button (click)="openBatchHost(1,'关闭')" nz-button nzType="default"><i
class="anticon anticon-pause-circle-o"></i>停止监控 class="anticon anticon-pause-circle-o"></i>停止监控
...@@ -52,7 +46,7 @@ ...@@ -52,7 +46,7 @@
</button> </button>
</div> </div>
</div> </div>
<nz-table #nzTable [nzData]="dataSet" nzSingleSort [nzLoading]="loading"> <nz-table #nzTable [nzData]="dataSet" nzSingleSort [nzLoading]="loading" [nzTotal]="totalNum" [nzPageIndex]="pageIndex" [nzPageSize]="pageSize" (nzPageIndexChange)="getwebList()" [nzFrontPagination]="false">
<thead> <thead>
<tr> <tr>
<th [nzChecked]="allChecked"></th> <th [nzChecked]="allChecked"></th>
...@@ -69,24 +63,23 @@ ...@@ -69,24 +63,23 @@
</thead> </thead>
<tbody> <tbody>
<!--资源分组--> <!--资源分组-->
<ng-template ngFor let-data [ngForOf]="nzTable.data"> <ng-container *ngFor="let item of dataSet">
<ng-template ngFor let-item [ngForOf]="expandDataCache[data.host]"> <tr>
<tr *ngIf="(item.parent&&item.parent.expand)||!(item.parent)">
<!--子集--> <!--子集-->
<ng-container *ngIf="item.level"> <td nzShowCheckbox (nzCheckedChange)="selectChecked($event,item)"></td>
<td nzShowCheckbox [nzIndeterminate]="indeterminate" <td class="cursor">
(nzCheckedChange)="selectChecked($event,item)" [(nzChecked)]="item.checked"></td>
<td class="cursor" [nzIndentSize]="item.level*20">
<span (click)="goDetail(item)">{{item.name}}</span> <span (click)="goDetail(item)">{{item.name}}</span>
</td> </td>
</ng-container> <td>
<span *ngIf="item.status == 0">启用</span>
<td class="round-tag tag-form"></td> <span *ngIf="item.status == 1">禁用</span>
<td></td> </td>
<td></td> <td>最近检查记录</td>
<td></td> <td>{{item.steps.length}}</td>
<td></td> <td>{{item.delay}}</td>
<td></td> <td>{{item.retries}}</td>
<td>{{item.authentication}}</td>
<td>{{item.headers}}</td>
<td class="handle"> <td class="handle">
<span (click)="editBasicModal(item)">编辑</span> <span (click)="editBasicModal(item)">编辑</span>
<span (click)="showDeleteConfirm(item)">删除</span> <span (click)="showDeleteConfirm(item)">删除</span>
...@@ -95,17 +88,16 @@ ...@@ -95,17 +88,16 @@
</a> </a>
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
<li (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li> <li (click)="showTempStop(item)" nz-menu-item><a>临时暂停</a></li>
<li (click)="openHost(item)" nz-menu-item><a> <li (click)="openHost(item)" nz-menu-item><a>监控</a></li>
<ng-container *ngIf="item.status == 1">开启</ng-container>
<ng-container *ngIf="item.status == 0">停止</ng-container>监控
</a></li>
<li nz-menu-item (click)="goDetail(item)"><a>查看监测点</a></li> <li nz-menu-item (click)="goDetail(item)"><a>查看监测点</a></li>
<li (click)="showAlarm(item)" nz-menu-item><a>添加告警</a></li> <li (click)="showAlarm(item)" nz-menu-item><a>添加告警</a></li>
</ul> </ul>
</nz-dropdown> </nz-dropdown>
</td> </td>
</tr> </tr>
</ng-template> </ng-container>
</ng-template>
</tbody> </tbody>
</nz-table> </nz-table>
<!--添加网站-->
<smart-website #smartWebsite></smart-website>
\ No newline at end of file
src/main/webapp/app/overAll/network-check/network-check.component.ts
View file @ e5dbde52
import {Component, OnInit} from '@angular/core'; import {Component, OnInit, ViewChild} from '@angular/core';
import {OverAllService} from '../overAll.service'; import {OverAllService} from '../overAll.service';
import {pageSize} from '../../app.constants'; import {pageSize} from '../../app.constants';
import {WebsiteComponent} from '../../modal/website/website.component';
@Component({ @Component({
selector: 'smart-network-check', selector: 'smart-network-check',
...@@ -8,13 +9,17 @@ import {pageSize} from '../../app.constants'; ...@@ -8,13 +9,17 @@ import {pageSize} from '../../app.constants';
styles: [] styles: []
}) })
export class NetworkCheckComponent implements OnInit { export class NetworkCheckComponent implements OnInit {
@ViewChild('smartWebsite') smartWebsite:WebsiteComponent;
dataSet; dataSet;
deviceNo; deviceNo;
loading = false;
allChecked;
name; name;
pageIndex = 1; pageIndex = 1;
pageSize = pageSize; pageSize = pageSize;
totalNum;
checkStatus = { checkStatus = {
green: '', green: '',
...@@ -31,17 +36,21 @@ export class NetworkCheckComponent implements OnInit { ...@@ -31,17 +36,21 @@ export class NetworkCheckComponent implements OnInit {
this.getCheckStatus(); this.getCheckStatus();
} }
//网站列表
getwebList() { getwebList() {
this.loading = true;
const data = { const data = {
name:'', name:this.name,
eventPage:this.pageIndex, eventPage:this.pageIndex,
pageRecords:this.pageSize pageRecords:this.pageSize
}; };
this.overAllSer.findWebscenario(data).subscribe( this.overAllSer.findWebscenario(data).subscribe(
(res) => { (res) => {
if (res.errCode == 10000) { if (res.errCode == 10000) {
this.dataSet = res.data; this.dataSet = res.data.data;
this.totalNum = res.data.totalNum;
} }
this.loading = false;
} }
); );
} }
...@@ -50,4 +59,19 @@ export class NetworkCheckComponent implements OnInit { ...@@ -50,4 +59,19 @@ export class NetworkCheckComponent implements OnInit {
getCheckStatus() { getCheckStatus() {
} }
//添加网站
showAddmodal(){
this.smartWebsite.showAddModal();
}
//批量开启or关闭
openBatchHost(status,opreation){
}
//批量删除
batchDeleteConfirm(){
}
} }
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