+DASHBOARD_URL=http://labs.opnfv.org
+
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG=False
restart: always
build: ./web/
container_name: dg01
- command: bash -c "python manage.py makemigrations && python manage.py migrate && python manage.py collectstatic --no-input && gunicorn pharos_dashboard.wsgi -b 0.0.0.0:8000"
+ command: bash -c "python manage.py migrate && python manage.py collectstatic --no-input && gunicorn pharos_dashboard.wsgi -b 0.0.0.0:8000"
depends_on:
- postgres
links:
- rabbitmq
volumes:
- ./:/pharos_dashboard
-
#!/bin/sh
# Create Rabbitmq user
-( sleep 20 ; \
+( sleep 10 ; \
rabbitmqctl add_user $RABBITMQ_USER $RABBITMQ_PASSWORD 2>/dev/null ; \
rabbitmqctl set_user_tags $RABBITMQ_USER administrator ; \
rabbitmqctl set_permissions -p / $RABBITMQ_USER ".*" ".*" ".*" ; \
from dashboard.models import *
+admin.site.site_header = "Pharos Dashboard Administration"
+admin.site.site_title = "Pharos Dashboard"
+
admin.site.register(Resource)
admin.site.register(Server)
admin.site.register(ResourceStatus)
--- /dev/null
+##############################################################################
+# Copyright (c) 2016 Max Breitenfeldt and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-05-05 08:15
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dashboard', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='resource',
+ name='dev_pod',
+ field=models.BooleanField(default=False),
+ ),
+ migrations.AlterField(
+ model_name='resource',
+ name='owner',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user_lab_owner', to=settings.AUTH_USER_MODEL),
+ ),
+ migrations.AlterField(
+ model_name='resource',
+ name='slave',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='jenkins.JenkinsSlave'),
+ ),
+ ]
name = models.CharField(max_length=100, unique=True)
description = models.CharField(max_length=300, blank=True, null=True)
url = models.CharField(max_length=100, blank=True, null=True)
- owner = models.ForeignKey(User, related_name='user_lab_owner', null=True)
+ owner = models.ForeignKey(User, related_name='user_lab_owner', null=True, blank=True)
vpn_users = models.ManyToManyField(User, related_name='user_vpn_users', blank=True)
- slave = models.ForeignKey(JenkinsSlave, on_delete=models.DO_NOTHING, null=True)
+ slave = models.ForeignKey(JenkinsSlave, on_delete=models.DO_NOTHING, null=True, blank=True)
+ dev_pod = models.BooleanField(default=False)
def get_booking_utilization(self, weeks):
"""
template_name = "dashboard/dev_pods.html"
def get_context_data(self, **kwargs):
- resources = Resource.objects.filter(slave__dev_pod=True, slave__active=True)
+ resources = Resource.objects.filter(dev_pod=True)
bookings = Booking.objects.filter(start__lte=timezone.now())
bookings = bookings.filter(end__gt=timezone.now())
def get_context_data(self, **kwargs):
resource = get_object_or_404(Resource, id=self.kwargs['resource_id'])
- utilization = resource.slave.get_utilization(timedelta(days=7))
bookings = Booking.objects.filter(resource=resource, end__gt=timezone.now())
context = super(ResourceView, self).get_context_data(**kwargs)
- context.update({'title': str(resource), 'resource': resource, 'utilization': utilization,
- 'bookings': bookings})
+ context.update({'title': str(resource), 'resource': resource, 'bookings': bookings})
return context
@shared_task
def send_booking_notifications():
- with Notification(dashboard_url=settings.RABBITMQ_URL) as messaging:
+ with Notification(dashboard_url=settings.RABBITMQ_URL, user=settings.RABBITMQ_USER, password=settings.RABBITMQ_PASSWORD) as messaging:
now = timezone.now()
notifications = BookingNotification.objects.filter(submitted=False,
submit_time__gt=now - timedelta(minutes=1),
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
# Application definition
OAUTH_ACCESS_TOKEN_URL = JIRA_URL + '/plugins/servlet/oauth/access-token'
OAUTH_AUTHORIZE_URL = JIRA_URL + '/plugins/servlet/oauth/authorize'
-OAUTH_CALLBACK_URL = JIRA_URL + '/accounts/authenticated'
+OAUTH_CALLBACK_URL = os.environ['DASHBOARD_URL'] + '/accounts/authenticated'
# Celery Settings
CELERY_TIMEZONE = 'UTC'
RABBITMQ_URL = 'rabbitmq'
-BROKER_URL = 'amqp://guest:guest@rabbitmq:5672//'
+RABBITMQ_USER = os.environ['RABBITMQ_USER']
+RABBITMQ_PASSWORD = os.environ['RABBITMQ_PASSWORD']
+
+BROKER_URL = 'amqp://' + RABBITMQ_USER + ':' + RABBITMQ_PASSWORD + '@rabbitmq:5672//'
CELERYBEAT_SCHEDULE = {
'sync-jenkins': {
<span class="icon-bar"></span>
</button>
<a href="https://www.opnfv.org/" class="navbar-left"><img
- src="https://www.opnfv.org/sites/all/themes/opnfv/logo.png"></a>
+ src="http://artifacts.opnfv.org/apex/review/14099/installation-instructions/_static/opnfv-logo.png"></a>
<a class="navbar-brand" href={% url 'dashboard:index' %}>Pharos Dashboard</a>
</div>
<!-- /.navbar-header -->
<!-- /#page-wrapper -->
</div>
<!-- /#wrapper -->
-{% endblock basecontent %}
\ No newline at end of file
+{% endblock basecontent %}
Code Review / pharos.git / commitdiff