+
+
+{% if instance %}
+{% set flavor = flavors[instance.flavor]|default('') %}
+{{ name }} Project: {{ project }}
+
+
+{% else %}
+
+
+
+
+ + + {{ name }} +
+
+
+ -
+
- Project +
- {{ project }} +
- Instance name +
- {{ instance.name }} +
- Instance ID +
- {{ instance.id }} +
- Host +
- {{ instance.hostname }} +
- Status +
- + {% if instance.status == "ACTIVE" %} + Active, + {% else %} + {{ instance.status }}, + {% endif %} + + {% if instance.operating_status == "HEALTHY" %} + Healthy + {% else %} + {{ instance.operating_status }} + {% endif %} + +
- Type +
- {{ instance.datastore.type }} {{ instance.datastore.version }} +
- Storage size +
- {{ instance.size }}G +
- Resources +
- + {{ flavor.vcpus|default('-') }} CPUs, + {{ flavor.ram|default('-') }}M RAM + ({{ flavor.name }}) + + {% if instance.databases %} +
- Databases +
-
+
-
+ {% for database in instance.databases | sort %}
+
- {{ database }} + {% endfor %} +
+ {% endif %}
+
Unknown database instance '{{ name }}'. Are you just guessing?
+{% endif %} +{% endblock %} diff --git a/templates/flavors.html b/templates/flavors.html new file mode 100644 index 0000000..d65cdf6 --- /dev/null +++ b/templates/flavors.html @@ -0,0 +1,47 @@ +{% extends "layout.html" %} + +{% block title %}Flavors - {{ super() }}{% endblock %} + +{% block content %} +
+
+{% endblock %}
+
+{% block css %}
+
+{% endblock %}
+{% block js %}
+{{ super() }}
+
+
+{% endblock %}
diff --git a/templates/hierakey.html b/templates/hierakey.html
index 76ebd96..7591a8e 100644
--- a/templates/hierakey.html
+++ b/templates/hierakey.html
@@ -23,14 +23,14 @@
+
+
+
+
+
+
+ + + Available flavors +
+| Name | +CPUs | +RAM | +
|---|---|---|
| {{ flavor.name|default('UNKNOWN') }} | +{{ flavor.vcpus|default('-') }} | +{{ flavor.ram|default('-') }}M | +
{% for project, prefixes in data.items()|sort() %}
{% if project != 'admin' %}
- Project: {{ project }}
+ Project: {{ project }}
{% if '_' in prefixes.keys() %}
- All project instances
{% endif %}
{% for prefix in prefixes.keys()|sort() %}
{% if prefix != '_' %}
- {% if prefix.endswith('wmflabs') %}
+ {% if prefix.endswith('.cloud') %}
- {{ prefix }}
{% else %}
- {{ prefix }}*
diff --git a/templates/home.html b/templates/home.html
index 91413dd..07a28a9 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -2,10 +2,13 @@
{% block content %}
+{% if usage %}
-
- Usage
+
+
+ Usage
+
@@ -39,5 +42,18 @@
Last updated: {{ usage.generated }} UTC
+{% endif %}
{% endblock %}
+{% block css %}
+
+{% endblock %}
+{% block js %}
+{{ super() }}
+
+
+{% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
index 4edadc1..164342e 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -35,12 +35,23 @@
- Projects
{% endwith %}
{% with servers = url_for('servers') %}
- - Servers
+ - Servers
{% endwith %}
- Proxies
{% with classes = url_for('all_puppetclasses') %}
- Puppet Classes
{% endwith %}
+ {% with flavors = url_for('flavors') %}
+ {% with networks = url_for('networks') %}
+ -
+ Metadata
+
+
+ {% endwith %}
+ {% endwith %}
{% block navright %}{% endblock %}
@@ -71,10 +82,11 @@
- 
+
diff --git a/templates/loadbalancer.html b/templates/loadbalancer.html
new file mode 100644
index 0000000..a2b55b0
--- /dev/null
+++ b/templates/loadbalancer.html
@@ -0,0 +1,92 @@
+{% extends "layout.html" %}
+
+{% block title %}Load balancer {% if lb %}{{ lb.name }}{% endif %} - {{ super() }}{% endblock %}
+
+{% block content %}
+{% if project %}
+
+{% endif %}
+
+{% if lb %}
+
+ {{ lb.name }} Project: {{ project_name }}
+
+
+
+
+
+
+
+ {{ lb.name }}
+
+
+
+
+ - Project
+ - {{ project_name }}
+ - Load balancer name
+ - {{ lb.name }}
+ - Load balancer ID
+ - {{ lb.id }}
+ - Status
+ -
+ {% if lb.provisioning_status == "ACTIVE" %}
+ Active,
+ {% else %}
+ {{ lb.provisioning_status }},
+ {% endif %}
+
+ {% if lb.operating_status == "ONLINE" %}
+ Online
+ {% else %}
+ {{ lb.operating_status }}
+ {% endif %}
+
+ - Provider
+ - {{ lb.provider }}
+ - VIPs
+ -
+
+ {% for vip in lb.vips %}
+ - {{ vip }}
+ {% endfor %}
+
+
+ - Listeners
+ -
+
+ {% for listener in lb.listeners %}
+ - {{ listener.protocol }} (port {{ listener.port }})
+ {% endfor %}
+
+
+ - Backends
+ -
+
+ {% for pool in lb.pools %}
+ - {{ pool.protocol }}
+ -
+
+ {% for member in pool.members %}
+ - {{ member.address }} (port {{ member.port }})
+ {% endfor %}
+
+
+ {% endfor %}
+
+
+
+
+
+
+{% else %}
+Unknown load balancer '{{ id }}'. Are you just guessing?
+{% endif %}
+{% endblock %}
diff --git a/templates/networks.html b/templates/networks.html
new file mode 100644
index 0000000..4d5462b
--- /dev/null
+++ b/templates/networks.html
@@ -0,0 +1,52 @@
+{% extends "layout.html" %}
+
+{% block title %}Networks - {{ super() }}{% endblock %}
+
+{% block content %}
+
+
+
+
+
+ Networks
+
+
+
+
+
+ Network
+ Subnet
+ Subnet CIDR
+
+
+
+ {% for network in networks.values()|sort(attribute='name') %}
+ {% for subnet in network.subnets|sort(attribute='cidr') %}
+
+ {% if loop.first %}
+ {% set rowspan = network.subnets|length %}
+ {{ network.name }}
+ {% endif %}
+ {{ subnet.name }}
+ {{ subnet.cidr }}
+
+ {% endfor %}
+ {% endfor %}
+
+
+
+
+{% endblock %}
+
+{% block css %}
+
+{% endblock %}
+{% block js %}
+{{ super() }}
+
+
+{% endblock %}
diff --git a/templates/project.html b/templates/project.html
index af85fee..0a8e9b9 100644
--- a/templates/project.html
+++ b/templates/project.html
@@ -1,19 +1,39 @@
{% extends "layout.html" %}
-{% block title %}Project {{ project }} - {{ super() }}{% endblock %}
+{% block title %}Project {{ project_name }} - {{ super() }}{% endblock %}
{% block content %}
- Project: {{ project|capitalize }}
+ Project: {{ project_name }}
-{% if admins or users or servers or proxies or zones %}
+{% if data %}
+
+
+
+
+ Project
+
+
+
+
+ - Name
+ - {{ data.name }}
+ - ID
+ - {{ data.id }}
+ {% if data.description %}
+ - Description
+ - {{ data.description }}
+ {% endif %}
+
+
+
- {% if admins %}
+
+
+
+
+ Limits
+
+
+
+
+ {% for region, region_limits in limits.items() %}
+ {% set cinder_region_limits = cinder_limits[region] %}
+ {% set neutron_region_limits = neutron_limits[region]['quota'] %}
+ - {{ region }}
+ -
+ {{ region_limits['absolute']['totalInstancesUsed'] }} / {{ region_limits['absolute']['maxTotalInstances'] }} instances.
+ {{ region_limits['absolute']['totalCoresUsed'] }} / {{ region_limits['absolute']['maxTotalCores'] }} VCPUs.
+ {{ region_limits['absolute']['totalRAMUsed'] / 1024 }} GB / {{ region_limits['absolute']['maxTotalRAMSize'] / 1024 }} GB RAM.
+ {{ neutron_region_limits['floatingip']['used'] }} / {{ neutron_region_limits['floatingip']['limit'] }} floating IPs.
+ {{ neutron_region_limits['security_group']['used'] }} / {{ neutron_region_limits['security_group']['limit'] }} security groups.
+ {{ cinder_region_limits['volumes']['in_use'] }} / {{ cinder_region_limits['volumes']['limit'] }} volumes.
+ {{ cinder_region_limits['gigabytes']['in_use'] }} / {{ cinder_region_limits['gigabytes']['limit'] }} GB volume space.
+
+ {% endfor %}
+
+
+ {% if members %}
- Administrators
+ Members
- {% for u in admins|sort(attribute='cn') %}
+ {% for u in members|sort(attribute='cn') %}
- {{ u.cn }}
{% endfor %}
{% endif %}
- {% if users %}
+ {% if viewers %}
-
+
-
+
- {% for u in users|sort(attribute='cn') %}
+ {% for u in viewers|sort(attribute='cn') %}
- {{ u.cn }}
{% endfor %}
{% endif %}
+ {% if service_accounts %}
+
+
+
+
+ Service accounts
+
+
+
+ {% for role, users in service_accounts.items() %}
+ - {{ role }}
+ -
+
+ {% for u in users|sort(attribute='cn') %}
+ - {{ u.cn }}
+ {% endfor %}
+
+
+ {% endfor %}
+
+
+ {% endif %}
{% if proxies %}
@@ -93,10 +160,10 @@
{% for backend in proxy.backends %}
{% with fqdn=backend|extract_hostname %}
- {% if fqdn is ipv4addr %}
- UNKNOWN
- {% else %}
+ {% if fqdn %}
{{ fqdn }}
+ {% else %}
+ Unknown
{% endif %}
{% endwith %}
{% endfor %}
@@ -107,29 +174,206 @@
{% endif %}
+ {% if floating_ips %}
+
+
+
+
+ Floating IPs
+
+
+
+
+
+ Address
+ Description
+ Mapped to
+ DNS names
+
+
+
+ {% for floating_ip in floating_ips|sort(attribute='sortkey') %}
+
+ {{ floating_ip.address }}
+ {{ floating_ip.description }}
+
+ {% if floating_ip.target %}
+ {{ floating_ip.target }}
+ {% if floating_ip.target_dns %}
+ ({{ floating_ip.target_dns|join(', ') }})
+ {% endif %}
+ {% else %}
+ (unused)
+ {% endif %}
+
+
+
+ {% for name in floating_ip.dns|sort %}
+ - {{ name }}
+ {% endfor %}
+
+
+
+ {% endfor %}
+
+
+
+ {% endif %}
+ {% if load_balancers %}
+
+
+
+
+ Load balancers
+
+
+
+
+
+ Name
+ Address
+ Status
+
+
+
+ {% for lb in load_balancers|sort(attribute='name') %}
+
+ {{ lb.name }}
+
+
+ {% for vip in lb.vips|sort %}
+ - {{ vip }}
+ {% endfor %}
+
+
+
+ {% if lb.provisioning_status == "ACTIVE" %}
+ Active,
+ {% else %}
+ {{ lb.provisioning_status }},
+ {% endif %}
+
+ {% if lb.operating_status == "ONLINE" %}
+ Online
+ {% else %}
+ {{ lb.operating_status }}
+ {% endif %}
+
+
+ {% endfor %}
+
+
+
+ {% endif %}
{% if zones %}
- DNS
+ DNS zones
Name
- Address
- {% for zone in zones|sort(attribute='name') %}
+ {% for zone in zones|sort %}
+
+ {{ zone }}
+
+ {% endfor %}
+
+
+
+ {% endif %}
+ {% if volumes %}
+
+
+
+
+ Volumes
+
+
+
+
+
+ Name
+ Size
+ Status
+
+
+
+ {% for volume in volumes|sort(attribute='name') %}
- {{ zone.name }}
+ {{ volume.name }}
+ {{ volume.size|default('-') }}G
- {% for ip in zone.records %}
- {{ ip }}
- {% endfor %}
+ {% if volume.status == "in-use" %}
+ Attached to
+ {% for attachment in volume.attachments %}
+ {% for server in servers %}
+ {% if server.id == attachment.server_id %}
+ {% set fqdn = server.name ~ '.' ~ project_name ~ '.eqiad1.wikimedia.cloud' %}
+ {{ fqdn }}
+ {% endif %}
+ {% endfor %}
+ {% endfor %}
+ {% elif volume.status == "available" %}
+ Unattached
+ {% else %}
+ {{ volume.status }}
+ {% endif %}
+
+
+ {% endfor %}
+
+
+
+ {% endif %}
+ {% if databases %}
+
+
+
+
+ Databases
+
+
+
+
+
+ Instance name
+ Type
+ Storage
+ Resources
+ Status
+
+
+
+ {% for database in databases|sort(attribute='name') %}
+ {% set flavor = flavors[database.flavor.id]|default('') %}
+
+ {{ database.name }}
+ {{ database.datastore.type }} {{ database.datastore.version }}
+ {{ database.volume.size|default('-') }}G
+
+ {{ flavor.vcpus|default('-') }} CPUs,
+ {{ flavor.ram|default('-') }}M RAM
+
+
+ {% if database.status == "ACTIVE" %}
+ Active,
+ {% else %}
+ {{ database.status }},
+ {% endif %}
+
+ {% if database.operating_status == "HEALTHY" %}
+ Healthy
+ {% else %}
+ {{ database.operating_status }}
+ {% endif %}
{% endfor %}
@@ -141,7 +385,7 @@
-
+
Instances
@@ -155,26 +399,30 @@
CPUs
RAM
Storage
+ Hypervisor
Last modified
- {% for server in servers|sort(attribute='name') %}
+ {% for server in servers %}
{% set image = images[server.image.id]|default('') %}
{% set flavor = flavors[server.flavor.id]|default('') %}
- {% set fqdn = server.name ~ '.' ~ project ~ '.eqiad.wmflabs' %}
+ {% set fqdn = server.name ~ '.' ~ server.project_name ~ '.eqiad1.wikimedia.cloud' %}
{{ fqdn }}
{{ flavor.name|default('UNKNOWN') }}
{{ image.name|default('UNKNOWN') }}
- {% if 'public' in server.addresses %}
- {{ server.addresses.public[0].addr }}
- {% else %}
- -
+ {% for sdn, interfaces in server.addresses.items() %}
+ {% for interface in interfaces %}
+ {% if interface['OS-EXT-IPS:type'] == 'fixed' %}
+ {{ interface.addr }}
{% endif %}
+ {% endfor %}
+ {% endfor %}
{{ flavor.vcpus|default('-') }}
{{ flavor.ram|default('-') }}M
{{ flavor.disk|default('-') }}G
+ {{ server['OS-EXT-SRV-ATTR:hypervisor_hostname'] }}
{{ server.updated }}
{% endfor %}
@@ -184,7 +432,7 @@
{% endif %}
{% else %}
-
Unknown project '{{ project }}'. Are you just guessing?
+Failed to collect information about project '{{ project_name }}'.
{% endif %}
{% endblock %}
diff --git a/templates/project_404.html b/templates/project_404.html
new file mode 100644
index 0000000..37198d4
--- /dev/null
+++ b/templates/project_404.html
@@ -0,0 +1,16 @@
+{% extends "layout.html" %}
+
+{% block title %}Project {{ project }} - {{ super() }}{% endblock %}
+
+{% block content %}
+
+
+
+ Project: {{ project }}
+
+
+Unknown project '{{ project }}'. Are you just guessing?
+{% endblock %}
diff --git a/templates/projects.html b/templates/projects.html
index d227e97..e1ca8a5 100644
--- a/templates/projects.html
+++ b/templates/projects.html
@@ -9,9 +9,9 @@
- {% for project in projects %}
- {% if project != 'admin' %}
- - {{ project }}
+ {% for project_id, project_name in projects|dictsort(by='value') %}
+ {% if project_id != 'admin' %}
+ - {{ project_name }}
{% endif %}
{% endfor %}
diff --git a/templates/proxies.html b/templates/proxies.html
index 5afdc8b..7192ff6 100644
--- a/templates/proxies.html
+++ b/templates/proxies.html
@@ -21,9 +21,9 @@
- {% for proxy in proxies|sort(attribute='project') %}
+ {% for proxy in proxies|sort(attribute='project_name') %}
- {{ proxy.project }}
+ {{ proxy.project_name }}
{{ proxy.domain }}
{% for backend in proxy.backends %}
@@ -33,10 +33,10 @@
{% for backend in proxy.backends %}
{% with fqdn=backend|extract_hostname %}
- {% if fqdn is ipv4addr %}
- UNKNOWN
- {% else %}
+ {% if fqdn %}
{{ fqdn }}
+ {% else %}
+ Unknown
{% endif %}
{% endwith %}
{% endfor %}
diff --git a/templates/puppetclass.html b/templates/puppetclass.html
index e9cfc21..3033af0 100644
--- a/templates/puppetclass.html
+++ b/templates/puppetclass.html
@@ -23,14 +23,14 @@
{% for project, prefixes in data.items()|sort() %}
{% if project != 'admin' %}
- Project: {{ project }}
+ Project: {{ project }}
{% if '_' in prefixes.prefixes %}
- All project instances
{% endif %}
{% for prefix in prefixes.prefixes|sort() %}
{% if prefix != '_' %}
- {% if prefix.endswith('wmflabs') %}
+ {% if prefix.endswith('.cloud') %}
- {{ prefix }}
{% else %}
- {{ prefix }}*
diff --git a/templates/server.html b/templates/server.html
index de855ff..c2011eb 100644
--- a/templates/server.html
+++ b/templates/server.html
@@ -5,7 +5,7 @@
{% block content %}
@@ -27,21 +27,25 @@
- Project
- - {{ server.tenant_id }}
+ - {{ project }}
- Instance name
- {{ server.name }}
- Instance Id
- {{ server.id }}
- IP
- {% if 'public' in server.addresses %}
- {% for interface in server.addresses.public %}
+ {% for sdn, interfaces in server.addresses.items() %}
+ {% for interface in interfaces %}
- {{ interface.addr }} [{{ interface['OS-EXT-IPS:type'] }}]
{% endfor %}
{% else %}
- -
- {% endif %}
+ {% endfor %}
- Status
- {{ server.status }}
+ - Host hypervisor
+ - {{ server['OS-EXT-SRV-ATTR:hypervisor_hostname'] }}
+ - Libvirt ID
+ - {{ server['OS-EXT-SRV-ATTR:instance_name'] }}
- Type
- {{ flavor.name|default('UNKNOWN') }}
- Image
diff --git a/templates/servers.html b/templates/servers.html
index 345c04d..90c35bb 100644
--- a/templates/servers.html
+++ b/templates/servers.html
@@ -9,8 +9,8 @@
- {% for server in servers %}
- {% set fqdn = server.name ~ '.' ~ server.tenant_id ~ '.eqiad.wmflabs' %}
+ {% for server in servers|sort(attribute='name,project_name') %}
+ {% set fqdn = server.name ~ '.' ~ server.project_name ~ '.eqiad1.wikimedia.cloud' %}
- {{ fqdn }}
{% endfor %}
diff --git a/templates/user.html b/templates/user.html
index 987d626..fb8cb19 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -16,13 +16,29 @@ User: {{ user.cn }}
- - Wikitech
- - User:{{ user.cn }}
- - shell
+ - Developer account
+ - {{ user.cn }}
+ - Shell
- {{ user.uid }}
+ {% if domain_roles %}
+
+
+
+ System-wide roles
+
+
+
+ {% for role in domain_roles %}
+ - {{ role }}
+ {% endfor %}
+
+
+
+ {% endif %}
+ {% if projects %}
@@ -30,12 +46,13 @@ User: {{ user.cn }}
- {% for project in projects %}
- - {{ project }}
+ {% for project_id, project_name in projects %}
+ - {{ project_name }}
{% endfor %}
+ {% endif %}
{% else %}
Unknown user '{{ uid }}'. Are you just guessing?
diff --git a/templates/zone.html b/templates/zone.html
new file mode 100644
index 0000000..80538e7
--- /dev/null
+++ b/templates/zone.html
@@ -0,0 +1,129 @@
+{% extends "layout.html" %}
+
+{% block title %}Zone {{ name }} - {{ super() }}{% endblock %}
+
+{% block content %}
+
+
+
+ {{ name }}
+
+
+{% if zone %}
+
+
+
+
+
+ {{ name }}
+
+
+
+
+ - Project
+ - {{ project_name }}
+ - Zone ID
+ - {{ zone.id }}
+ - Type
+ -
+ {% if zone.type == "PRIMARY" %}
+ Primary
+ {% elif zone.type == "SECONDARY" %}
+ Secondary
+ {% else %}
+ {{ zone.type }}
+ {% endif %}
+
+ - Status
+ -
+ {% if zone.status == "ACTIVE" %}
+ Active
+ {% else %}
+ {{ zone.status }}
+ {% endif %}
+
+ {% if zone.description %}
+ - Description
+ - {{ zone.description }}
+ {% endif %}
+
+
+
+
+ {% if records %}
+
+
+
+
+ Records
+
+
+
+
+
+ Name
+ Status
+ Type
+ Target
+
+
+
+ {% for record in records|sort(attribute='sortkey,type') %}
+
+
+ {% if record.name == "@" or record.name == "*" %}
+ {{ record.name }}
+ {% else %}
+ {{ record.name }}
+ {% endif %}
+
+
+ {% if record.status == "ACTIVE" %}
+ Active
+ {% else %}
+ {{ record.status }}
+ {% endif %}
+
+ {{ record.type }}
+
+
+ {% for target in record.records|sort %}
+ -
+ {% if record.type == "TXT" %}
+
{{ target }}
+ {% else %}
+ {{ target }}
+ {% endif %}
+
+ {% endfor %}
+
+
+
+ {% endfor %}
+
+
+
+ {% endif %}
+
+{% else %}
+Unknown DNS zone '{{ name }}'. Are you just guessing?
+{% endif %}
+{% endblock %}
+
+{% block css %}
+
+{% endblock %}
+{% block js %}
+{{ super() }}
+
+
+{% endblock %}
diff --git a/tox.ini b/tox.ini
index 140a05a..5dbe735 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,23 @@
[tox]
minversion = 1.6
skipsdist = True
-envlist = py3
+envlist = py3-{format,pytest}
-[testenv]
+[testenv:py3-format]
commands =
+ black --check --diff .
flake8
- nosetests --with-doctest
deps =
-r{toxinidir}/requirements.txt
+ black
flake8
- nose
+
+[testenv:py3-pytest]
+commands = pytest -v {posargs}
+deps = pytest
[flake8]
-exclude = .tox
+exclude = .tox,venv
count = 1
show-pep8 = 1
show-source = 1
Project: {{ project }}
+Project: {{ project }}
-
{% if '_' in prefixes.keys() %}
- All project instances {% endif %} {% for prefix in prefixes.keys()|sort() %} {% if prefix != '_' %} - {% if prefix.endswith('wmflabs') %} + {% if prefix.endswith('.cloud') %}
- {{ prefix }} {% else %}
- {{ prefix }}* diff --git a/templates/home.html b/templates/home.html index 91413dd..07a28a9 100644 --- a/templates/home.html +++ b/templates/home.html @@ -2,10 +2,13 @@ {% block content %}
- Projects {% endwith %} {% with servers = url_for('servers') %} -
- Servers +
- Servers {% endwith %}
- Proxies {% with classes = url_for('all_puppetclasses') %}
- Puppet Classes {% endwith %} + {% with flavors = url_for('flavors') %} + {% with networks = url_for('networks') %} +
- + Metadata + + + {% endwith %} + {% endwith %}
- Project +
- {{ project_name }} +
- Load balancer name +
- {{ lb.name }} +
- Load balancer ID +
- {{ lb.id }} +
- Status +
- + {% if lb.provisioning_status == "ACTIVE" %} + Active, + {% else %} + {{ lb.provisioning_status }}, + {% endif %} + + {% if lb.operating_status == "ONLINE" %} + Online + {% else %} + {{ lb.operating_status }} + {% endif %} + +
- Provider +
- {{ lb.provider }} +
- VIPs +
-
+
-
+ {% for vip in lb.vips %}
+
- {{ vip }} + {% endfor %} +
+ - Listeners +
-
+
-
+ {% for listener in lb.listeners %}
+
- {{ listener.protocol }} (port {{ listener.port }}) + {% endfor %} +
+ - Backends +
-
+
-
+ {% for pool in lb.pools %}
+
- {{ pool.protocol }} +
-
+
-
+ {% for member in pool.members %}
+
- {{ member.address }} (port {{ member.port }}) + {% endfor %} +
+ {% endfor %}
+
+ - Name +
- {{ data.name }} +
- ID +
- {{ data.id }} + {% if data.description %} +
- Description +
- {{ data.description }} + {% endif %} +
- {{ region }} +
- + {{ region_limits['absolute']['totalInstancesUsed'] }} / {{ region_limits['absolute']['maxTotalInstances'] }} instances. + {{ region_limits['absolute']['totalCoresUsed'] }} / {{ region_limits['absolute']['maxTotalCores'] }} VCPUs. + {{ region_limits['absolute']['totalRAMUsed'] / 1024 }} GB / {{ region_limits['absolute']['maxTotalRAMSize'] / 1024 }} GB RAM. + {{ neutron_region_limits['floatingip']['used'] }} / {{ neutron_region_limits['floatingip']['limit'] }} floating IPs. + {{ neutron_region_limits['security_group']['used'] }} / {{ neutron_region_limits['security_group']['limit'] }} security groups. + {{ cinder_region_limits['volumes']['in_use'] }} / {{ cinder_region_limits['volumes']['limit'] }} volumes. + {{ cinder_region_limits['gigabytes']['in_use'] }} / {{ cinder_region_limits['gigabytes']['limit'] }} GB volume space. + + {% endfor %} +
- {{ u.cn }} {% endfor %}
- {{ u.cn }} {% endfor %}
- {{ role }} +
-
+
-
+ {% for u in users|sort(attribute='cn') %}
+
- {{ u.cn }} + {% endfor %} +
+ {% endfor %}
+ - {{ name }} + {% endfor %} +
- {{ vip }} + {% endfor %} +
- {{ project }} + {% for project_id, project_name in projects|dictsort(by='value') %} + {% if project_id != 'admin' %} +
- {{ project_name }} {% endif %} {% endfor %}
- All project instances {% endif %} {% for prefix in prefixes.prefixes|sort() %} {% if prefix != '_' %} - {% if prefix.endswith('wmflabs') %} + {% if prefix.endswith('.cloud') %}
- {{ prefix }} {% else %}
- {{ prefix }}* diff --git a/templates/server.html b/templates/server.html index de855ff..c2011eb 100644 --- a/templates/server.html +++ b/templates/server.html @@ -5,7 +5,7 @@ {% block content %} @@ -27,21 +27,25 @@
- Project -
- {{ server.tenant_id }} +
- {{ project }}
- Instance name
- {{ server.name }}
- Instance Id
- {{ server.id }}
- IP - {% if 'public' in server.addresses %} - {% for interface in server.addresses.public %} + {% for sdn, interfaces in server.addresses.items() %} + {% for interface in interfaces %}
- {{ interface.addr }} [{{ interface['OS-EXT-IPS:type'] }}] {% endfor %} {% else %}
- - - {% endif %} + {% endfor %}
- Status
- {{ server.status }} +
- Host hypervisor +
- {{ server['OS-EXT-SRV-ATTR:hypervisor_hostname'] }} +
- Libvirt ID +
- {{ server['OS-EXT-SRV-ATTR:instance_name'] }}
- Type
- {{ flavor.name|default('UNKNOWN') }}
- Image diff --git a/templates/servers.html b/templates/servers.html index 345c04d..90c35bb 100644 --- a/templates/servers.html +++ b/templates/servers.html @@ -9,8 +9,8 @@
- {{ fqdn }} {% endfor %}
- Wikitech -
- User:{{ user.cn }} -
- shell +
- Developer account +
- {{ user.cn }} +
- Shell
- {{ user.uid }}
- {{ role }} + {% endfor %} +
- {{ project }} + {% for project_id, project_name in projects %} +
- {{ project_name }} {% endfor %}
- Project +
- {{ project_name }} +
- Zone ID +
- {{ zone.id }} +
- Type +
- + {% if zone.type == "PRIMARY" %} + Primary + {% elif zone.type == "SECONDARY" %} + Secondary + {% else %} + {{ zone.type }} + {% endif %} + +
- Status +
- + {% if zone.status == "ACTIVE" %} + Active + {% else %} + {{ zone.status }} + {% endif %} + + {% if zone.description %} +
- Description +
- {{ zone.description }} + {% endif %} +
-
+ {% if record.type == "TXT" %}
+
{{ target }}+ {% else %} + {{ target }} + {% endif %} +
+ {% endfor %}
+
+{% if usage %}
@@ -39,5 +42,18 @@
Last updated: {{ usage.generated }} UTC
+{% endif %}
{% endblock %}
+{% block css %}
+
+{% endblock %}
+{% block js %}
+{{ super() }}
+
+
+{% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
index 4edadc1..164342e 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -35,12 +35,23 @@
{% endif %}
+ {% if floating_ips %}
+
+
+ {% endif %}
+ {% if volumes %}
+
-
- Usage
+
+ + Usage +
| Network | +Subnet | +Subnet CIDR | +
|---|---|---|
| {{ network.name }} | + {% endif %} +{{ subnet.name }} | +{{ subnet.cidr }} | +
-
-{% if admins or users or servers or proxies or zones %}
+{% if data %}
Project: {{ project|capitalize }}
+Project: {{ project_name }}
+
{% endif %}
- {% if users %}
+ {% if viewers %}
+
- {% if admins %}
+
+
+ + + Project +
+
+
+ -
+
+
+ {% if members %}
+
+ + + Limits +
+
+
+ {% for region, region_limits in limits.items() %}
+ {% set cinder_region_limits = cinder_limits[region] %}
+ {% set neutron_region_limits = neutron_limits[region]['quota'] %}
+
+ - Administrators + Members
-
- {% for u in admins|sort(attribute='cn') %}
+ {% for u in members|sort(attribute='cn') %}
-
+
-
+
{% endif %}
+ {% if service_accounts %}
+ -
- {% for u in users|sort(attribute='cn') %}
+ {% for u in viewers|sort(attribute='cn') %}
+
+ {% endif %}
{% if proxies %}
+
+ + + Service accounts +
+
+ {% for role, users in service_accounts.items() %}
+
+
@@ -93,10 +160,10 @@
{% for backend in proxy.backends %}
{% with fqdn=backend|extract_hostname %}
- {% if fqdn is ipv4addr %}
- UNKNOWN
- {% else %}
+ {% if fqdn %}
{{ fqdn }}
+ {% else %}
+ Unknown
{% endif %}
{% endwith %}
{% endfor %}
@@ -107,29 +174,206 @@
+
+
+
+
+ {% endif %}
+ {% if load_balancers %}
+
+
+ + + Floating IPs +
+| Address | +Description | +Mapped to | +DNS names | +
|---|---|---|---|
| {{ floating_ip.address }} | +{{ floating_ip.description }} | ++ {% if floating_ip.target %} + {{ floating_ip.target }} + {% if floating_ip.target_dns %} + ({{ floating_ip.target_dns|join(', ') }}) + {% endif %} + {% else %} + (unused) + {% endif %} + | +
+
|
+
+
+
+
+
+ {% endif %}
{% if zones %}
+
+ + + Load balancers +
+| Name | +Address | +Status | +
|---|---|---|
| {{ lb.name }} | +
+
|
+ + {% if lb.provisioning_status == "ACTIVE" %} + Active, + {% else %} + {{ lb.provisioning_status }}, + {% endif %} + + {% if lb.operating_status == "ONLINE" %} + Online + {% else %} + {{ lb.operating_status }} + {% endif %} + | +
- DNS + DNS zones
| Name | -Address |
|---|---|
| {{ zone }} | +
+
+
+
+
+ {% endif %}
+ {% if databases %}
+
+
+ + + Volumes +
+| Name | +Size | +Status | +|
|---|---|---|---|
| {{ zone.name }} | +{{ volume.name }} | +{{ volume.size|default('-') }}G | - {% for ip in zone.records %} - {{ ip }} - {% endfor %} + {% if volume.status == "in-use" %} + Attached to + {% for attachment in volume.attachments %} + {% for server in servers %} + {% if server.id == attachment.server_id %} + {% set fqdn = server.name ~ '.' ~ project_name ~ '.eqiad1.wikimedia.cloud' %} + {{ fqdn }} + {% endif %} + {% endfor %} + {% endfor %} + {% elif volume.status == "available" %} + Unattached + {% else %} + {{ volume.status }} + {% endif %} + | +
+
+
+
+
+ + + Databases +
+| Instance name | +Type | +Storage | +Resources | +Status | +||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ database.name }} | +{{ database.datastore.type }} {{ database.datastore.version }} | +{{ database.volume.size|default('-') }}G | ++ {{ flavor.vcpus|default('-') }} CPUs, + {{ flavor.ram|default('-') }}M RAM + | ++ {% if database.status == "ACTIVE" %} + Active, + {% else %} + {{ database.status }}, + {% endif %} + + {% if database.operating_status == "HEALTHY" %} + Healthy + {% else %} + {{ database.operating_status }} + {% endif %} | CPUs | RAM | Storage | +Hypervisor | Last modified | - {% for server in servers|sort(attribute='name') %} + {% for server in servers %} {% set image = images[server.image.id]|default('') %} {% set flavor = flavors[server.flavor.id]|default('') %} - {% set fqdn = server.name ~ '.' ~ project ~ '.eqiad.wmflabs' %} + {% set fqdn = server.name ~ '.' ~ server.project_name ~ '.eqiad1.wikimedia.cloud' %}|||
| {{ fqdn }} | {{ flavor.name|default('UNKNOWN') }} | {{ image.name|default('UNKNOWN') }} | - {% if 'public' in server.addresses %} -{{ server.addresses.public[0].addr }} | - {% else %} -- | +{% for sdn, interfaces in server.addresses.items() %} + {% for interface in interfaces %} + {% if interface['OS-EXT-IPS:type'] == 'fixed' %} + {{ interface.addr }} {% endif %} + {% endfor %} + {% endfor %} | {{ flavor.vcpus|default('-') }} | {{ flavor.ram|default('-') }}M | {{ flavor.disk|default('-') }}G | +{{ server['OS-EXT-SRV-ATTR:hypervisor_hostname'] }} | {{ server.updated }} | ||
| {{ proxy.project }} | +{{ proxy.project_name }} | {{ proxy.domain }} |
{% for backend in proxy.backends %}
@@ -33,10 +33,10 @@
Project: {{ project }}+Project: {{ project }}
User: {{ user.cn }}
+
+ System-wide roles
+
+
+
+
@@ -30,12 +46,13 @@
User: {{ user.cn }}
|
Unknown user '{{ uid }}'. Are you just guessing?
diff --git a/templates/zone.html b/templates/zone.html new file mode 100644 index 0000000..80538e7 --- /dev/null +++ b/templates/zone.html @@ -0,0 +1,129 @@ +{% extends "layout.html" %} + +{% block title %}Zone {{ name }} - {{ super() }}{% endblock %} + +{% block content %} + + +
+
+
+{% if zone %}
+{{ name }}
+
+
+{% else %}
+
+
+
+ {% if records %}
+
+
+ + + {{ name }} +
+
+
+ -
+
+
+
+
+
+ {% endif %}
+
+
+ + + Records +
+| Name | +Status | +Type | +Target | +
|---|---|---|---|
+ {% if record.name == "@" or record.name == "*" %}
+ {{ record.name }}
+ {% else %}
+ {{ record.name }}
+ {% endif %}
+ |
+ + {% if record.status == "ACTIVE" %} + Active + {% else %} + {{ record.status }} + {% endif %} + | +{{ record.type }} | +
+
|
+
Unknown DNS zone '{{ name }}'. Are you just guessing?
+{% endif %} +{% endblock %} + +{% block css %} + +{% endblock %} +{% block js %} +{{ super() }} + + +{% endblock %} diff --git a/tox.ini b/tox.ini index 140a05a..5dbe735 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,23 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py3 +envlist = py3-{format,pytest} -[testenv] +[testenv:py3-format] commands = + black --check --diff . flake8 - nosetests --with-doctest deps = -r{toxinidir}/requirements.txt + black flake8 - nose + +[testenv:py3-pytest] +commands = pytest -v {posargs} +deps = pytest [flake8] -exclude = .tox +exclude = .tox,venv count = 1 show-pep8 = 1 show-source = 1