@@ -235,6 +253,7 @@ addEventListener("DOMContentLoaded", function() {
| IP |
+ Region |
MAC Addr. |
Reverse DNS |
Control |
@@ -243,6 +262,7 @@ addEventListener("DOMContentLoaded", function() {
{% for address in inv_addresses %}
| {{ address.ip }} |
+ {{ region[address.region_id] }} |
{{ address.mac }} |
{{ address.rdns }} |
soon... |
@@ -255,6 +275,7 @@ addEventListener("DOMContentLoaded", function() {
+ {% endif %}
diff --git a/app/vmanager/routes.py b/app/vmanager/routes.py
index 50ee9bc..55f071d 100644
--- a/app/vmanager/routes.py
+++ b/app/vmanager/routes.py
@@ -124,30 +124,37 @@ def deploy(product_id=None):
def dashboard():
cuser = current_user
- inv_deployments = cuser.inv_deployments.filter_by(enabled=True).order_by(Deployment.date_created.desc())
+ inv_deployments = cuser.inv_deployments.order_by(Deployment.date_created.desc()).all()
inv_deploycubeids = []
inv_deployments_list = []
- for invcls in inv_deployments:
- inv_deploycubeids.extend([invcls.machine_id])
- inv_deployments_list.extend([invcls.machine_alias])
+ for invcls in inv_deployments:
+ if invcls.user_id == cuser.pid and invcls.enabled == True:
+ inv_deploycubeids.extend([invcls.machine_id])
+ inv_deployments_list.extend([invcls.machine_alias])
+
+ inv_services = cuser.inv_services.order_by(Service.date_last_charge.asc()).all()
+ inv_services_list = []
+ for invcls in inv_services:
+ if invcls.user_id == cuser.pid and invcls.enabled == True:
+ inv_services_list.extend([invcls.description])
- inv_services = cuser.inv_services.filter_by(enabled=True).order_by(Service.date_last_charge.asc())
- inv_services_list = []
- for invcls in inv_services:
- inv_services_list.extend([invcls.description])
-
- inv_domains = cuser.inv_domains.filter_by(enabled=True).order_by(Domain.date_created.desc())
+ inv_domains = cuser.inv_domains.order_by(Domain.date_created.desc()).all()
inv_domains_list = []
- for invcls in inv_domains:
- if invcls.user_id == cuser.pid and invcls.enabled == True:
+ for invcls in inv_domains:
+ if invcls.user_id == cuser.pid and invcls.enabled == True:
inv_domains_list.extend([invcls.fqdn])
- inv_addresses = cuser.inv_addresses.filter_by(enabled=True).order_by(Address.ip.asc())
+ inv_addresses = cuser.inv_addresses.order_by(Address.ip.asc()).all()
inv_addresses_list = []
for invcls in inv_addresses:
if invcls.user_id == cuser.pid and invcls.enabled == True:
inv_addresses_list.extend([invcls.ip])
+ sys_regions = Region.query.all()
+ regions = {}
+ for region in sys_regions:
+ regions[region.pid] = region.description
+
#extract rrd and status from the deployments
rrd = {}
statuses = {}
@@ -173,8 +180,8 @@ def dashboard():
send_email(current_app.config['MAIL_USERNAME'], 'Cube {} is unreachable'.format(cubeid),
'vmanager/email/adm_unreachable', user=current_user, cubeid=cubeid )
- current_app.logger.info('[{}] deployments: {}, services: {}, domains: {}, addresses: {}'.format(current_user.email, inv_deployments_list, inv_services_list, inv_domains_list, inv_addresses_list ))
- return render_template('vmanager/dashboard.html', rrd=rrd, status=statuses, inv_deployments=inv_deployments, inv_services=inv_services, inv_domains=inv_domains, inv_addresses=inv_addresses)
+ current_app.logger.info('[{}] Enabled deployments: {}, services: {}, domains: {}, addresses: {}'.format(current_user.email, inv_deployments_list, inv_services_list, inv_domains_list, inv_addresses_list ))
+ return render_template('vmanager/dashboard.html', rrd=rrd, status=statuses, inv_deployments=inv_deployments, inv_services=inv_services, inv_domains=inv_domains, inv_addresses=inv_addresses, region=regions)
@vmanager.route('//')
@@ -190,6 +197,7 @@ def command(cmd=None, vmid=0):
# flash('Недостатъчно средства в сметката за тази операция')
# return redirect(url_for('uinvoice.addfunds'))
+ #work with enabled deploys only
result = current_user.inv_deployments.filter_by(enabled=True).order_by(Deployment.date_created.desc())
inventory = []
for invcls in result:
@@ -197,7 +205,7 @@ def command(cmd=None, vmid=0):
#checks if current user owns this vmid
if not vmid in inventory:
- current_app.logger.warning('[{}] Access violation with cube id: {}'.format(current_user.pid, vmid))
+ current_app.logger.warning('[{}] Access violation with cube id: {}'.format(current_user.email, vmid))
#TODO: log ips
else:
db_result = contact_proxmaster({}, cmd, vmid)