layout changes, and update time changes

This commit is contained in:
adriant 2014-12-12 16:09:15 +13:00
parent d2df32db76
commit 9e6153b1ea
2 changed files with 14 additions and 14 deletions

View File

@ -14,14 +14,14 @@ from example_samplers import (
def run(args, conf, app, xyzzy):
samplers = [
CPUSampler(xyzzy, 5, conf['openstack']),
RAMSampler(xyzzy, 5, conf['openstack']),
IPSampler(xyzzy, 5, conf['openstack']),
RegionsCPUSampler(xyzzy, 5, conf['openstack']),
RegionsRAMSampler(xyzzy, 5, conf['openstack']),
RegionIPSampler(xyzzy, 5, conf['openstack']),
NagiosSampler(xyzzy, 5, conf['nagios']),
NagiosRegionSampler(xyzzy, 5, conf['nagios']),
CPUSampler(xyzzy, 60, conf['openstack']),
RAMSampler(xyzzy, 60, conf['openstack']),
IPSampler(xyzzy, 60, conf['openstack']),
RegionsCPUSampler(xyzzy, 60, conf['openstack']),
RegionsRAMSampler(xyzzy, 60, conf['openstack']),
RegionIPSampler(xyzzy, 60, conf['openstack']),
NagiosSampler(xyzzy, 15, conf['nagios']),
NagiosRegionSampler(xyzzy, 15, conf['nagios']),
# ConvergenceSampler(xyzzy, 1),
]

View File

@ -28,7 +28,7 @@
<div data-id="nagios" data-view="Nagios" data-unordered="true" data-title="Icinga Prod" data-moreinfo="Unacknowledged events"></div>
</li>
<li data-row="1" data-col="3" data-sizex="1" data-sizey="1">
<li data-row="2" data-col="2" data-sizex="1" data-sizey="1">
<div data-id="nagios_regions" data-view="NagiosList" data-title="Nagios by region" data-subtitle1="Criticals" data-subtitle2="Warnings"></div>
</li>
@ -36,23 +36,23 @@
<div data-id="cpu" data-view="Meter" data-title="VCPU"></div>
</li>
<li data-row="1" data-col="5" data-sizex="1" data-sizey="1">
<li data-row="2" data-col="4" data-sizex="1" data-sizey="1">
<div data-id="ram" data-view="Meter" data-title="RAM"></div>
</li>
<li data-row="1" data-col="6" data-sizex="1" data-sizey="1">
<li data-row="3" data-col="4" data-sizex="1" data-sizey="1">
<div data-id="ips" data-view="Meter" data-title="Floating IPs"></div>
</li>
<li data-row="2" data-col="1" data-sizex="2" data-sizey="1">
<li data-row="1" data-col="5" data-sizex="2" data-sizey="1">
<div data-id="cpu_regions" data-view="ProgressBars" data-title="VCPU provisioned per region"></div>
</li>
<li data-row="2" data-col="3" data-sizex="2" data-sizey="1">
<li data-row="2" data-col="5" data-sizex="2" data-sizey="1">
<div data-id="ram_regions" data-view="ProgressBars" data-title="RAM provisioned per region"></div>
</li>
<li data-row="2" data-col="5" data-sizex="2" data-sizey="1">
<li data-row="3" data-col="5" data-sizex="2" data-sizey="1">
<div data-id="ips_regions" data-view="ProgressBars" data-title="IPs provisioned per region"></div>
</li>