x/bansho
Code Issues Proposed changes

Merge branch 'master' into packaging

Browse Source
This commit is contained in:
Thibault Cohen 2015-04-29 17:16:07 -04:00
commit 846c31993d
15 changed files with 182 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -14,4 +14,9 @@ tmp
app/assets/css app/assets/css
.sass-cache/ .sass-cache/
out/ out/
build/
# Grunt generated files
dist/
.tmp/
app/components/live/live.js

4
Dockerfile
View File

@ -32,11 +32,11 @@ ADD /app /opt/adagios-frontend/app
# Override those variables at runtime to point Bansho to another backend # Override those variables at runtime to point Bansho to another backend
ENV BANSHO_BACKEND surveil ENV BANSHO_BACKEND surveil
ENV BANSHO_PROD true
ENV BANSHO_SURVEIL_URL http://surveil:8080/ ENV BANSHO_SURVEIL_URL http://surveil:8080/
ENV BANSHO_ADAGIOS_URL http://demo.kaji-project.org/ ENV BANSHO_ADAGIOS_URL http://demo.kaji-project.org/
CMD ./configure.sh && \ CMD ./configure.sh && \
cd /opt/adagios-frontend && \ cd /opt/adagios-frontend && \
grunt sass && \ bash -c "if [ $BANSHO_PROD = true ] ; then grunt production:$BANSHO_BACKEND ; fi" && \
grunt uglify:${BANSHO_BACKEND} && \
bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND" bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"

350
Gruntfile.js
View File

@ -2,15 +2,66 @@
module.exports = function (grunt) { module.exports = function (grunt) {
require('load-grunt-tasks')(grunt);
grunt.initConfig({ grunt.initConfig({
pkg: grunt.file.readJSON('package.json'), pkg: grunt.file.readJSON('package.json'),
project: { project: {
app: ['app'], app: 'app',
assets: ['<%= project.app %>/assets'], assets: '<%= project.app %>/assets',
css: ['<%= project.assets %>/sass/app.scss'], scss: '<%= project.assets %>/sass/app.scss',
build: ['<%= project.app %>/build/'] tmp: '.tmp',
dist: 'dist'
},
clean: {
dist: ['<%= project.dist %>/'],
tmp: ['<%= project.tmp %>/']
},
copy: {
prod: {
files: [
{
cwd: '<%= project.assets %>/css/',
expand: true,
src: ['**.*'],
dest: '<%= project.dist %>/assets/css/'
},
{
cwd: '<%= project.app %>/',
expand: true,
src: ['**/*.html'],
dest: '<%= project.dist %>/'
},
{
src: '<%= project.app %>/components/config/config.json',
dest: '<%= project.dist %>/components/config/config.json'
},
{
src: '<%= project.app %>/index.html',
dest: '<%= project.dist %>/index.html'
}
]
},
adagios: {
files: [
{
dest: '<%= project.app %>/components/live/live.js',
src: '<%= project.app %>/components/live/adagios.js'
}
]
},
surveil: {
files: [
{
dest: '<%= project.app %>/components/live/live.js',
src: '<%= project.app %>/components/live/surveil.js'
}
]
}
}, },
sass: { sass: {
@ -20,31 +71,11 @@ module.exports = function (grunt) {
compass: false compass: false
}, },
files: { files: {
'<%= project.assets %>/css/app.css' : '<%= project.css %>' '<%= project.assets %>/css/app.css': '<%= project.scss %>'
} }
} }
}, },
watch: {
sass: {
files: [
'<%= project.assets %>/sass/{,*/}*.{scss,sass}',
'<%= project.app %>/{,*/}*/{,*/}*.{scss,sass}'
],
tasks: ['sass:dev']
},
uglify: {
files: [
'<%= project.app %>/**/*.js',
'<%= project.app %>/**/*_test.js',
'!<%= project.app %>/bower_components/**',
'!<%= project.build %>/**',
'!<%= project.assets %>/**'
],
tasks: ['uglify:surveil']
}
},
jslint: { // configure the task jslint: { // configure the task
client: { client: {
@ -82,237 +113,70 @@ module.exports = function (grunt) {
} }
}, },
useminPrepare: {
html: {
src: ['<%= project.app %>/index.html']
},
options: {
dest: '<%= project.dist %>/'
}
},
usemin: {
html: '<%= project.dist %>/index.html'
},
concat: {
generated: {
nonull: true
}
},
// Minify and concatenate bansho in one file // Minify and concatenate bansho in one file
uglify: { uglify: {
compress: { generated: {
files: [{ nonull: true
'<%= project.build %>/js/bansho.min.js' : [
'<%= project.app %>/app.js',
'<%= project.app %>/app.js',
'<%= project.app %>/components/config/config.js',
'<%= project.app %>/components/utils/promise_manager.js',
'<%= project.app %>/components/live/live.js',
'<%= project.app %>/components/live/surveil.js',
'<%= project.app %>/components/ng-justgage/ng-justgage.js',
'<%= project.app %>/components/filters/filters.js',
'<%= project.app %>/components/sidebar/sidebar.js',
'<%= project.app %>/components/topbar/topbar.js',
'<%= project.app %>/components/tactical/tactical.js',
'<%= project.app %>/components/tactical/status_overview/status_overview.js',
'<%= project.app %>/components/tactical/current_health/current_health.js',
'<%= project.app %>/components/tactical/top_alert_producers/top_alert_producers.js',
'<%= project.app %>/components/table/actionbar/actionbar.js',
'<%= project.app %>/components/table/table.js',
'<%= project.app %>/components/table/cell_duration/cell_duration.js',
'<%= project.app %>/components/table/cell_host/cell_host.js',
'<%= project.app %>/components/table/cell_last_check/cell_last_check.js',
'<%= project.app %>/components/table/cell_service_check/cell_service_check.js',
'<%= project.app %>/components/table/cell_host_address/cell_host_address.js',
'<%= project.app %>/components/table/cell_host_status/cell_host_status.js',
'<%= project.app %>/components/host/host.js',
'<%= project.app %>/components/host/host_cpu/host_cpu.js',
'<%= project.app %>/components/host/host_info/host_info.js',
'<%= project.app %>/components/host/host_load/host_load.js',
'<%= project.app %>/components/host/host_main/host_main.js',
'<%= project.app %>/components/host/host_services_list/host_services_list.js',
'<%= project.app %>/components/service/service.js',
'<%= project.app %>/components/service/service_main/service_main.js',
'<%= project.app %>/components/service/service_info/service_info.js',
'<%= project.app %>/components/service/service_metrics/service_metrics.js',
'<%= project.app %>/routing_view/routing_view.js',
'<%= project.app %>/templates/dashboard/dashboard.js',
'<%= project.app %>/templates/single_table/single_table.js',
'<%= project.app %>/templates/host/host.js',
'<%= project.app %>/templates/service/service.js'
]
}],
options: {
mangle: true
}
}, },
options: {
mangle: true
}
},
watch: {
adagios: { adagios: {
files: [ files: [
{ '<%= project.app %>/components/live/adagios.js',
'<%= project.build %>/app.js': '<%= project.app %>/app.js', '<%= project.assets %>/sass/{,*/}*.{scss,sass}'
'<%= project.build %>/components/config/config.js': '<%= project.app %>/components/config/config.js',
'<%= project.build %>/components/utils/promise_manager.js': '<%= project.app %>/components/utils/promise_manager.js',
'<%= project.build %>/components/live/live.js': '<%= project.app %>/components/live/live.js',
'<%= project.build %>/components/live/adagios.js': '<%= project.app %>/components/live/adagios.js',
'<%= project.build %>/components/ng-justgage/ng-justgage.js': '<%= project.app %>/components/ng-justgage/ng-justgage.js',
'<%= project.build %>/components/filters/filters.js': '<%= project.app %>/components/filters/filters.js',
'<%= project.build %>/components/sidebar/sidebar.js': '<%= project.app %>/components/sidebar/sidebar.js',
'<%= project.build %>/components/topbar/topbar.js': '<%= project.app %>/components/topbar/topbar.js',
'<%= project.build %>/components/tactical/tactical.js': '<%= project.app %>/components/tactical/tactical.js',
'<%= project.build %>/components/tactical/status_overview/status_overview.js': '<%= project.app %>/components/tactical/status_overview/status_overview.js',
'<%= project.build %>/components/tactical/current_health/current_health.js': '<%= project.app %>/components/tactical/current_health/current_health.js',
'<%= project.build %>/components/tactical/top_alert_producers/top_alert_producers.js': '<%= project.app %>/components/tactical/top_alert_producers/top_alert_producers.js',
'<%= project.build %>/components/table/actionbar/actionbar.js': '<%= project.app %>/components/table/actionbar/actionbar.js',
'<%= project.build %>/components/table/table.js': '<%= project.app %>/components/table/table.js',
'<%= project.build %>/components/table/cell_duration/cell_duration.js': '<%= project.app %>/components/table/cell_duration/cell_duration.js',
'<%= project.build %>/components/table/cell_host/cell_host.js': '<%= project.app %>/components/table/cell_host/cell_host.js',
'<%= project.build %>/components/table/cell_last_check/cell_last_check.js': '<%= project.app %>/components/table/cell_last_check/cell_last_check.js',
'<%= project.build %>/components/table/cell_service_check/cell_service_check.js': '<%= project.app %>/components/table/cell_service_check/cell_service_check.js',
'<%= project.build %>/components/table/cell_host_address/cell_host_address.js': '<%= project.app %>/components/table/cell_host_address/cell_host_address.js',
'<%= project.build %>/components/table/cell_host_status/cell_host_status.js': '<%= project.app %>/components/table/cell_host_status/cell_host_status.js',
'<%= project.build %>/components/host/host.js': '<%= project.app %>/components/host/host.js',
'<%= project.build %>/components/host/host_cpu/host_cpu.js': '<%= project.app %>/components/host/host_cpu/host_cpu.js',
'<%= project.build %>/components/host/host_info/host_info.js': '<%= project.app %>/components/host/host_info/host_info.js',
'<%= project.build %>/components/host/host_load/host_load.js': '<%= project.app %>/components/host/host_load/host_load.js',
'<%= project.build %>/components/host/host_main/host_main.js': '<%= project.app %>/components/host/host_main/host_main.js',
'<%= project.build %>/components/host/host_services_list/host_services_list.js': '<%= project.app %>/components/host/host_services_list/host_services_list.js',
'<%= project.build %>/components/service/service.js': '<%= project.app %>/components/service/service.js',
'<%= project.build %>/components/service/service_main/service_main.js': '<%= project.app %>/components/service/service_main/service_main.js',
'<%= project.build %>/components/service/service_info/service_info.js': '<%= project.app %>/components/service/service_info/service_info.js',
'<%= project.build %>/components/service/service_metrics/service_metrics.js': '<%= project.app %>/components/service/service_metrics/service_metrics.js',
'<%= project.build %>/routing_view/routing_view.js': '<%= project.app %>/routing_view/routing_view.js',
'<%= project.build %>/templates/dashboard/dashboard.js': '<%= project.app %>/templates/dashboard/dashboard.js',
'<%= project.build %>/templates/single_table/single_table.js' : '<%= project.app %>/templates/single_table/single_table.js',
'<%= project.build %>/templates/host/host.js': '<%= project.app %>/templates/host/host.js',
'<%= project.build %>/templates/service/service.js': '<%= project.app %>/templates/service/service.js'
},
{
'<%= project.build %>/js/bansho.min.js' : [
'<%= project.build %>/app.js',
'<%= project.build %>/components/config/config.js',
'<%= project.build %>/components/utils/promise_manager.js',
'<%= project.build %>/components/live/live.js',
'<%= project.build %>/components/live/adagios.js',
'<%= project.build %>/components/ng-justgage/ng-justgage.js',
'<%= project.build %>/components/filters/filters.js',
'<%= project.build %>/components/sidebar/sidebar.js',
'<%= project.build %>/components/topbar/topbar.js',
'<%= project.build %>/components/tactical/tactical.js',
'<%= project.build %>/components/tactical/status_overview/status_overview.js',
'<%= project.build %>/components/tactical/current_health/current_health.js',
'<%= project.build %>/components/tactical/top_alert_producers/top_alert_producers.js',
'<%= project.build %>/components/table/actionbar/actionbar.js',
'<%= project.build %>/components/table/table.js',
'<%= project.build %>/components/table/cell_duration/cell_duration.js',
'<%= project.build %>/components/table/cell_host/cell_host.js',
'<%= project.build %>/components/table/cell_last_check/cell_last_check.js',
'<%= project.build %>/components/table/cell_service_check/cell_service_check.js',
'<%= project.build %>/components/table/cell_host_address/cell_host_address.js',
'<%= project.build %>/components/table/cell_host_status/cell_host_status.js',
'<%= project.build %>/components/host/host.js',
'<%= project.build %>/components/host/host_cpu/host_cpu.js',
'<%= project.build %>/components/host/host_info/host_info.js',
'<%= project.build %>/components/host/host_load/host_load.js',
'<%= project.build %>/components/host/host_main/host_main.js',
'<%= project.build %>/components/host/host_services_list/host_services_list.js',
'<%= project.build %>/components/service/service.js',
'<%= project.build %>/components/service/service_main/service_main.js',
'<%= project.build %>/components/service/service_info/service_info.js',
'<%= project.build %>/components/service/service_metrics/service_metrics.js',
'<%= project.build %>/routing_view/routing_view.js',
'<%= project.build %>/templates/dashboard/dashboard.js',
'<%= project.build %>/templates/single_table/single_table.js',
'<%= project.build %>/templates/host/host.js',
'<%= project.build %>/templates/service/service.js'
]
}
], ],
options: { tasks: ['copy:adagios', 'sass:dev']
mangle: false,
beautify: true
}
}, },
surveil: { surveil: {
files: [ files: [
{ '<%= project.app %>/components/live/surveil.js',
'<%= project.build %>/app.js': '<%= project.app %>/app.js', '<%= project.assets %>/sass/{,*/}*.{scss,sass}'
'<%= project.build %>/components/config/config.js': '<%= project.app %>/components/config/config.js',
'<%= project.build %>/components/utils/promise_manager.js': '<%= project.app %>/components/utils/promise_manager.js',
'<%= project.build %>/components/live/live.js': '<%= project.app %>/components/live/live.js',
'<%= project.build %>/components/live/surveil.js': '<%= project.app %>/components/live/surveil.js',
'<%= project.build %>/components/ng-justgage/ng-justgage.js': '<%= project.app %>/components/ng-justgage/ng-justgage.js',
'<%= project.build %>/components/filters/filters.js': '<%= project.app %>/components/filters/filters.js',
'<%= project.build %>/components/sidebar/sidebar.js': '<%= project.app %>/components/sidebar/sidebar.js',
'<%= project.build %>/components/topbar/topbar.js': '<%= project.app %>/components/topbar/topbar.js',
'<%= project.build %>/components/tactical/tactical.js': '<%= project.app %>/components/tactical/tactical.js',
'<%= project.build %>/components/tactical/status_overview/status_overview.js': '<%= project.app %>/components/tactical/status_overview/status_overview.js',
'<%= project.build %>/components/tactical/current_health/current_health.js': '<%= project.app %>/components/tactical/current_health/current_health.js',
'<%= project.build %>/components/tactical/top_alert_producers/top_alert_producers.js': '<%= project.app %>/components/tactical/top_alert_producers/top_alert_producers.js',
'<%= project.build %>/components/table/actionbar/actionbar.js': '<%= project.app %>/components/table/actionbar/actionbar.js',
'<%= project.build %>/components/table/table.js': '<%= project.app %>/components/table/table.js',
'<%= project.build %>/components/table/cell_duration/cell_duration.js': '<%= project.app %>/components/table/cell_duration/cell_duration.js',
'<%= project.build %>/components/table/cell_host/cell_host.js': '<%= project.app %>/components/table/cell_host/cell_host.js',
'<%= project.build %>/components/table/cell_last_check/cell_last_check.js': '<%= project.app %>/components/table/cell_last_check/cell_last_check.js',
'<%= project.build %>/components/table/cell_service_check/cell_service_check.js': '<%= project.app %>/components/table/cell_service_check/cell_service_check.js',
'<%= project.build %>/components/table/cell_host_address/cell_host_address.js': '<%= project.app %>/components/table/cell_host_address/cell_host_address.js',
'<%= project.build %>/components/table/cell_host_status/cell_host_status.js': '<%= project.app %>/components/table/cell_host_status/cell_host_status.js',
'<%= project.build %>/components/host/host.js': '<%= project.app %>/components/host/host.js',
'<%= project.build %>/components/host/host_cpu/host_cpu.js': '<%= project.app %>/components/host/host_cpu/host_cpu.js',
'<%= project.build %>/components/host/host_info/host_info.js': '<%= project.app %>/components/host/host_info/host_info.js',
'<%= project.build %>/components/host/host_load/host_load.js': '<%= project.app %>/components/host/host_load/host_load.js',
'<%= project.build %>/components/host/host_main/host_main.js': '<%= project.app %>/components/host/host_main/host_main.js',
'<%= project.build %>/components/host/host_services_list/host_services_list.js': '<%= project.app %>/components/host/host_services_list/host_services_list.js',
'<%= project.build %>/components/service/service.js': '<%= project.app %>/components/service/service.js',
'<%= project.build %>/components/service/service_main/service_main.js': '<%= project.app %>/components/service/service_main/service_main.js',
'<%= project.build %>/components/service/service_info/service_info.js': '<%= project.app %>/components/service/service_info/service_info.js',
'<%= project.build %>/components/service/service_metrics/service_metrics.js': '<%= project.app %>/components/service/service_metrics/service_metrics.js',
'<%= project.build %>/routing_view/routing_view.js': '<%= project.app %>/routing_view/routing_view.js',
'<%= project.build %>/templates/dashboard/dashboard.js': '<%= project.app %>/templates/dashboard/dashboard.js',
'<%= project.build %>/templates/single_table/single_table.js' : '<%= project.app %>/templates/single_table/single_table.js',
'<%= project.build %>/templates/host/host.js': '<%= project.app %>/templates/host/host.js',
'<%= project.build %>/templates/service/service.js': '<%= project.app %>/templates/service/service.js'
},
{
'<%= project.build %>/js/bansho.min.js' : [
'<%= project.build %>/app.js',
'<%= project.build %>/components/config/config.js',
'<%= project.build %>/components/utils/promise_manager.js',
'<%= project.build %>/components/live/live.js',
'<%= project.build %>/components/live/surveil.js',
'<%= project.build %>/components/ng-justgage/ng-justgage.js',
'<%= project.build %>/components/filters/filters.js',
'<%= project.build %>/components/sidebar/sidebar.js',
'<%= project.build %>/components/topbar/topbar.js',
'<%= project.build %>/components/tactical/tactical.js',
'<%= project.build %>/components/tactical/status_overview/status_overview.js',
'<%= project.build %>/components/tactical/current_health/current_health.js',
'<%= project.build %>/components/tactical/top_alert_producers/top_alert_producers.js',
'<%= project.build %>/components/table/actionbar/actionbar.js',
'<%= project.build %>/components/table/table.js',
'<%= project.build %>/components/table/cell_duration/cell_duration.js',
'<%= project.build %>/components/table/cell_host/cell_host.js',
'<%= project.build %>/components/table/cell_last_check/cell_last_check.js',
'<%= project.build %>/components/table/cell_service_check/cell_service_check.js',
'<%= project.build %>/components/table/cell_host_address/cell_host_address.js',
'<%= project.build %>/components/table/cell_host_status/cell_host_status.js',
'<%= project.build %>/components/host/host.js',
'<%= project.build %>/components/host/host_cpu/host_cpu.js',
'<%= project.build %>/components/host/host_info/host_info.js',
'<%= project.build %>/components/host/host_load/host_load.js',
'<%= project.build %>/components/host/host_main/host_main.js',
'<%= project.build %>/components/host/host_services_list/host_services_list.js',
'<%= project.build %>/components/service/service.js',
'<%= project.build %>/components/service/service_main/service_main.js',
'<%= project.build %>/components/service/service_info/service_info.js',
'<%= project.build %>/components/service/service_metrics/service_metrics.js',
'<%= project.build %>/routing_view/routing_view.js',
'<%= project.build %>/templates/dashboard/dashboard.js',
'<%= project.build %>/templates/single_table/single_table.js',
'<%= project.build %>/templates/host/host.js',
'<%= project.build %>/templates/service/service.js'
]
}
], ],
options: { tasks: ['copy:surveil', 'sass:dev']
mangle: false,
beautify: true
}
} }
} }
}); });
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-jslint');
grunt.registerTask('default', ['watch']); grunt.registerTask('default', ['watch']);
grunt.registerTask('development:adagios', [
'sass', 'copy:adagios', 'watch:adagios'
]);
grunt.registerTask('development:surveil', [
'sass', 'copy:surveil', 'watch:surveil'
]);
grunt.registerTask('production:adagios', [
'clean', 'sass', 'copy:prod', 'useminPrepare:html', 'concat:generated',
'copy:adagios',
'uglify:generated', 'usemin:html']);
grunt.registerTask('production:surveil', [
'clean', 'sass', 'copy:prod', 'useminPrepare:html', 'concat:generated',
'copy:surveil',
'uglify:generated', 'usemin:html']);
}; };

11
Makefile
View File

@ -9,14 +9,17 @@ rebuild:
sudo docker build --no-cache -t adg-fe . sudo docker build --no-cache -t adg-fe .
interactive: interactive:
sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -v ${PWD}:/opt/adagios-frontend -i -t --name adg-fe adg-fe bash sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -v $(shell pwd)/app:/opt/adagios-frontend/dist -e BANSHO_ENV=false -i -t --name adg-fe adg-fe bash
daemon: daemon:
sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -v ${PWD}:/opt/adagios-frontend -d -t --name adg-fe adg-fe sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -v $(shell pwd)/app:/opt/adagios-frontend/dist -e BANSHO_PROD=false -d -t --name adg-fe adg-fe
grunt watch grunt development:surveil
production:
sudo docker run -p 8888:8888 --link surveil_surveil_1:surveil -d -t --name adg-fe adg-fe
kill: kill:
sudo docker kill adg-fe sudo docker kill adg-fe
remove: remove:
sudo docker rm adg-fe sudo docker rm -f adg-fe

2
app/components/host/host_cpu/host_cpu.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('bansho.host.cpu', []) angular.module('bansho.host.cpu', ['bansho.live'])
.controller('HostCpuCtrl', ['$scope', 'getObjects', function ($scope, getObjects) { .controller('HostCpuCtrl', ['$scope', 'getObjects', function ($scope, getObjects) {
var hostName = $scope.hostName, var hostName = $scope.hostName,

2
app/components/live/adagios.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('bansho.live') angular.module('bansho.live', [])
.constant('filterSuffixes', { contains: '__contains', .constant('filterSuffixes', { contains: '__contains',
has_field: '__has_field', has_field: '__has_field',

3
app/components/live/live.js
View File

@ -1,3 +0,0 @@
'use strict';
angular.module('bansho.live', []);

2
app/components/live/surveil.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('bansho.live') angular.module('bansho.live', [])
.service('getObjects', ['$http', 'hostQueryTransform', 'hostMiddleware', 'serviceMiddleware', .service('getObjects', ['$http', 'hostQueryTransform', 'hostMiddleware', 'serviceMiddleware',
function ($http, hostQueryTransform, hostMiddleware, serviceMiddleware) { function ($http, hostQueryTransform, hostMiddleware, serviceMiddleware) {

55
app/index.html
View File

@ -12,14 +12,53 @@
<link rel="stylesheet" href="assets/css/app.css"> <link rel="stylesheet" href="assets/css/app.css">
<meta name="description" content=""> <meta name="description" content="">
<!-- Angular --> <!-- build:js js/app.min.js -->
<script src="bower_components/angular/angular.js"></script> <script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script> <script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/moment/moment.js"></script>
<script src="bower_components/raphael/raphael-min.js"></script>
<script src="bower_components/justgage-toorshia/justgage.js"></script>
<script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js"></script>
<script src="assets/js/scripts.js"></script>
<script src="bower_components/html5-boilerplate/js/vendor/modernizr-2.6.2.min.js"></script>
<script src="bower_components/html5-boilerplate/js/vendor/modernizr-2.6.2.min.js"></script> <script src="app.js"></script>
<script src="bower_components/moment/moment.js"></script> <script src="components/config/config.js"></script>
<script src="components/utils/promise_manager.js"></script>
<script src="build/js/bansho.min.js"></script> <script src="components/live/live.js"></script>
<script src="components/ng-justgage/ng-justgage.js"></script>
<script src="components/filters/filters.js"></script>
<script src="components/sidebar/sidebar.js"></script>
<script src="components/topbar/topbar.js"></script>
<script src="components/tactical/tactical.js"></script>
<script src="components/tactical/status_overview/status_overview.js"></script>
<script src="components/tactical/current_health/current_health.js"></script>
<script src="components/tactical/top_alert_producers/top_alert_producers.js"></script>
<script src="components/table/actionbar/actionbar.js"></script>
<script src="components/table/table.js"></script>
<script src="components/table/cell_duration/cell_duration.js"></script>
<script src="components/table/cell_host/cell_host.js"></script>
<script src="components/table/cell_last_check/cell_last_check.js"></script>
<script src="components/table/cell_service_check/cell_service_check.js"></script>
<script src="components/table/cell_host_address/cell_host_address.js"></script>
<script src="components/table/cell_host_status/cell_host_status.js"></script>
<script src="components/host/host.js"></script>
<script src="components/host/host_cpu/host_cpu.js"></script>
<script src="components/host/host_info/host_info.js"></script>
<script src="compoents/host/host_load/host_load.js"></script>
<script src="components/host/host_main/host_main.js"></script>
<script src="components/host/host_services_list/host_services_list.js"></script>
<script src="components/service/service.js"></script>
<script src="components/service/service_main/service_main.js"></script>
<script src="components/service/service_info/service_info.js"></script>
<script src="components/service/service_metrics/service_metrics.js"></script>
<script src="routing_view/routing_view.js"></script>
<script src="templates/dashboard/dashboard.js"></script>
<script src="templates/single_table/single_table.js"></script>
<script src="templates/host/host.js"></script>
<script src="templates/service/service.js"></script>
<!-- endbuild -->
</head> </head>
<body class="layout color-scheme--dark"> <body class="layout color-scheme--dark">
@ -38,11 +77,5 @@
<footer class="footer" role="contentinfo">...</footer> <footer class="footer" role="contentinfo">...</footer>
</div> </div>
</div> </div>
<script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/raphael/raphael-min.js"></script>
<script src="bower_components/justgage-toorshia/justgage.js"></script>
<script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js"></script>
<script src="assets/js/scripts.js"></script>
</body> </body>
</html> </html>

4
container/000-default.conf
View File

@ -1,11 +1,11 @@
<Directory "/opt/adagios-frontend/app/"> <Directory "/opt/adagios-frontend/dist/">
Order allow,deny Order allow,deny
Allow from all Allow from all
Require all granted Require all granted
</Directory> </Directory>
<VirtualHost *:8888> <VirtualHost *:8888>
Alias / /opt/adagios-frontend/app/ Alias / /opt/adagios-frontend/dist/
ProxyPreserveHost On ProxyPreserveHost On

3
debian/control vendored
View File

@ -5,10 +5,9 @@ Priority: extra
Vcs-Git: https://github.com/savoirfairelinux/bansho.git Vcs-Git: https://github.com/savoirfairelinux/bansho.git
Vcs-Browser: https://github.com/savoirfairelinux/bansho Vcs-Browser: https://github.com/savoirfairelinux/bansho
Standards-Version: 3.9.6 Standards-Version: 3.9.6
XS-Python-Version: >= 2.5, << 2.8
Build-Depends: debhelper (>= 9), quilt, npm, ruby-sass Build-Depends: debhelper (>= 9), quilt, npm, ruby-sass
Homepage: https://github.com/savoirfairelinux/bansho Homepage: https://github.com/savoirfairelinux/bansho
Package: bansho Package: bansho
Architecture: any Architecture: all
Description: Bansho is a web interface for Surveil Description: Bansho is a web interface for Surveil

2
debian/install vendored
View File

@ -1 +1 @@
app/ usr/share/bansho dist/* usr/share/bansho

2
debian/links vendored
View File

@ -1 +1 @@
usr/share/bansho/web/config.js etc/bansho/web/config.js usr/share/bansho/config.json etc/bansho/config.json

6
debian/rules vendored
View File

@ -9,12 +9,10 @@ override_dh_auto_clean:
override_dh_auto_build: override_dh_auto_build:
$(shell bash -c "source dev_virtualenv") $(shell bash -c "source dev_virtualenv")
npm install grunt npm install grunt-cli
npm install npm install
$(shell bash -c "source dev_virtualenv") $(shell bash -c "source dev_virtualenv")
node_modules/grunt-cli/bin/grunt uglify node_modules/grunt-cli/bin/grunt production:surveil
node_modules/grunt-cli/bin/grunt sass
rm -rf node_modules
override_dh_install: override_dh_install:
dh_install dh_install

7
package.json
View File

@ -17,7 +17,12 @@
"karma-junit-reporter": "^0.2.2", "karma-junit-reporter": "^0.2.2",
"protractor": "^1.1.1", "protractor": "^1.1.1",
"shelljs": "^0.2.6", "shelljs": "^0.2.6",
"grunt-contrib-uglify": "~0.8.0" "grunt-contrib-uglify": "~0.8.0",
"grunt-usemin": "~3.0.0",
"grunt-contrib-concat": "~0.5.1",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-copy": "~0.8.0",
"load-grunt-tasks": "~3.1.0"
}, },
"scripts": { "scripts": {
"postinstall": "bower install", "postinstall": "bower install",