Fixes to merge

This commit is contained in:
Pedro S 2016-09-20 12:45:53 -07:00
commit 6e9b46521a
3 changed files with 10 additions and 8 deletions

View File

@ -26,8 +26,8 @@ md-input-container > md-select {
font-size: 22px !important;
}
.h3, h3 {
font-size: 22px !important;
font-weight: 400 !important;
font-size: 22px !important;
font-weight: 400 !important;
}
.vertical-repeater {
height: 100%;
@ -273,4 +273,4 @@ a.pull-right {
.invisibleButton:focus {
color: #000;
}
}

View File

@ -87,13 +87,14 @@
<md-card flex>
<md-card-title>
<md-card-title-text>
<span class="md-headline">Alerts</span>
<span class="md-headline">Alerts summary</span>
</md-card-title-text>
</md-card-title>
<md-card-content>
<kbn-dis table-height="800px;" dis-a="(columns:!(rule.description,rule.AlertLevel,rule.groups,rule.PCI_DSS,full_log),index:'ossec-*',interval:auto,query:'',sort:!('@timestamp',desc))"
dis-g="(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-24h,mode:quick,to:now))" dis-filter="AgentName: {{_agent.name}} " infinite-scroll="true">
</kbn-dis>
<kbn-vis vis-height="460px;" vis-type="table" vis-index-pattern="ossec-*" vis-a="(filters:!(),linked:!f,query:(query_string:(analyze_wildcard:!t,query:'*')),uiState:(vis:(params:(sort:(columnIndex:!n,direction:!n)))),vis:(aggs:!((enabled:!t,id:'1',params:(),schema:metric,type:count),(enabled:!t,id:'2',params:(customLabel:'Rule ID',field:rule.sidid,order:desc,orderBy:'1',size:20),schema:bucket,type:terms),(enabled:!t,id:'3',params:(customLabel:Description,field:rule.description,order:desc,orderBy:'1',size:1),schema:bucket,type:terms),(enabled:!t,id:'4',params:(customLabel:Level,field:rule.AlertLevel,order:desc,orderBy:'1',size:1),schema:bucket,type:terms),(enabled:!t,id:'5',params:(customLabel:Groups,field:rule.groups,order:desc,orderBy:'1',size:1),schema:bucket,type:terms),(enabled:!t,id:'6',params:(customLabel:'PCI DSS',field:rule.PCI_DSS,order:desc,orderBy:'1',size:1),schema:bucket,type:terms)),listeners:(),params:(perPage:10,showMeticsAtAllLevels:!f,showPartialRows:!f,showTotal:!f,sort:(columnIndex:!n,direction:!n),totalFunc:sum),title:'New%20Visualization',type:table))"
vis-g="(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-24h,mode:quick,to:now))"
vis-filter="{{_agent.name ? 'AgentName:'+_agent.name : '*'}}">
</kbn-vis>
</md-card-content>
</md-card>
</md-content>

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
<md-content ng-if="submenuNavItem == 'policy_monitoring'" ng-if="_agent" class="md-padding">
<div flex ng-controller="pmController" layout="column">
<md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="load"></md-progress-linear>
@ -72,4 +73,4 @@
</div>
</md-virtual-repeat-container>
</div>
</md-content>
</md-content>