From b1962c3f64114f3a6ca7b7c0ad52bcb47b6cbb2b Mon Sep 17 00:00:00 2001 From: Victor Castell Date: Wed, 13 Mar 2019 23:17:50 +0100 Subject: [PATCH] Merge --- dkron/assets/assets_vfsdata.go | 11 ++++++++- dkron/templates/templates_vfsdata.go | 9 +++++++ static/js/dashboard.js | 35 ++++++++-------------------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dkron/assets/assets_vfsdata.go b/dkron/assets/assets_vfsdata.go index 22ddd6b45..f2fdc6d94 100644 --- a/dkron/assets/assets_vfsdata.go +++ b/dkron/assets/assets_vfsdata.go @@ -712,7 +712,11 @@ var Assets = func() http.FileSystem { }, "/js": &vfsgen۰DirInfo{ name: "js", +<<<<<<< HEAD modTime: time.Date(2019, 1, 30, 20, 19, 45, 935088024, time.UTC), +======= + modTime: time.Date(2019, 3, 13, 21, 50, 49, 650582493, time.UTC), +>>>>>>> Main graph showing running jobs }, "/js/angular-route.min.js": &vfsgen۰CompressedFileInfo{ name: "angular-route.min.js", @@ -751,10 +755,15 @@ var Assets = func() http.FileSystem { }, "/js/dashboard.js": &vfsgen۰CompressedFileInfo{ name: "dashboard.js", +<<<<<<< HEAD modTime: time.Date(2019, 1, 30, 20, 19, 45, 932563116, time.UTC), uncompressedSize: 12739, +======= + modTime: time.Date(2019, 3, 13, 22, 3, 53, 406691818, time.UTC), + uncompressedSize: 12327, +>>>>>>> Main graph showing running jobs - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x4d\x73\xdb\x38\xd2\xbe\xfb\x57\xf4\xab\xc9\x5b\x94\xca\x12\x25\xcf\xee\x5e\x24\xcb\x55\x99\x7c\xec\x26\xb3\x93\x49\x25\x99\xdd\x83\xca\xe5\x82\xc8\x16\x09\x1b\x04\x18\x00\xb4\xa5\x4d\xe9\xbf\x6f\x01\xe0\xb7\x28\xcb\x4e\xb2\x89\xa7\xe2\x8b\x6c\x02\x8d\x46\xa3\xfb\x79\x9a\x0d\x80\xd7\x44\x42\x78\x25\x05\x87\x39\x10\x1e\x65\x8c\x48\x3f\x11\x61\xc6\xb0\xef\xd9\x76\x6f\x08\x0b\x2f\xef\x19\x49\x1a\x5c\xa9\x98\xdc\x78\x43\xf0\x32\xea\x07\x22\xc4\x84\x4a\x29\xa4\x77\x3e\x98\x1d\x1d\xd9\x01\xfe\x8a\x32\x8d\xb2\xef\x29\x4d\x74\xa6\x9e\x31\xa2\x94\x37\x84\x55\xc6\x03\x4d\x05\x87\xfe\x00\x3e\x1d\x01\x98\x89\x57\x92\x22\x0f\xd9\xe6\xbd\x95\x7c\x69\xc7\xc1\xbc\x26\x7a\x29\x96\x4e\x1a\x80\xae\xec\xa3\x1f\x52\x45\x96\x0c\xc3\xa2\x1d\x40\xa2\xce\x24\x07\x4f\xe3\x5a\x8f\x92\x4c\x63\x08\x11\xdb\xa4\x31\x0d\x04\x1f\x2d\x09\x1f\x05\x54\x06\x0c\x3d\x2b\xbe\xb5\xbf\xea\x86\xea\x20\x76\x0a\x9d\x99\x95\xba\x80\x28\x04\x4f\x65\x41\x80\x4a\x79\xd3\xbc\xb5\x9a\xc6\xc9\x8f\x72\x81\xda\x54\xe2\x6a\xa4\x68\xc4\xbd\x86\x9e\x15\xa1\x0c\xc3\xfd\x6a\x42\xc2\x23\x94\x35\x2d\x12\x13\x71\x8d\x1d\x9a\x52\x22\x35\x25\x8c\x6d\x2e\x0e\xe9\xbc\x21\x92\x53\x1e\xd5\x94\xe2\x3a\x60\x24\x21\xc6\xa9\x1d\x9a\x65\xc6\x8d\xfc\x7e\x85\xb9\x40\x4d\x61\xca\xc8\xa6\xc3\xaf\xf9\x38\xca\xd3\x4c\xcf\x8e\x00\xb6\xe6\x27\x6f\xec\x0a\xf6\xec\x68\x5b\xe1\x26\x10\x5c\x69\xc2\x75\xdf\x8b\x69\x88\xcf\x91\x91\x8d\x37\x84\x9f\x27\x93\x49\x43\x46\x4b\xc1\x98\xc1\xd7\x6b\xb1\xfc\x27\x55\xfa\x99\x96\xac\x81\xaf\x27\x2a\x10\x29\x0e\xe1\x49\xac\x75\x3a\x84\x27\x94\x6b\x94\xd7\x84\x0d\xa1\xd4\xeb\xa2\x3d\x1e\x43\x2a\x51\xeb\x0d\x5c\x2a\xc1\xad\x86\x23\x00\x37\xdc\xd7\xe2\xb5\xb2\xac\xa8\x14\x2b\x2d\x0b\x98\xe4\x6b\x2a\x18\xe3\x84\x8d\xc0\x10\xb4\xcc\x70\x60\x17\x5f\x29\xbb\x14\xcb\x0f\x98\xa4\x8c\x68\x84\x79\xae\x82\x93\x04\xa7\xd0\xbb\x14\xcb\xde\xd0\x81\x32\x88\xd1\x10\x6f\x0a\xbd\xbc\x45\xdc\x70\x94\xad\xc7\x0b\x4c\x08\x65\x55\x63\xc1\x87\x29\xac\x08\x53\xe8\x1a\x35\x89\xd4\x14\x3e\x6d\x87\x85\xb1\x92\xa2\x9a\xc2\xc4\x3d\xa7\x52\x18\xe8\x0a\xa9\xa6\xc0\x33\xc6\x5c\x6b\x20\x78\x90\x49\x89\x3c\xd8\x4c\xa1\x47\x18\x13\x37\xf9\x14\xb8\xc6\x20\xd3\xc2\x58\xa2\x62\x64\xac\xd5\x7c\x11\x08\xbe\xa2\xd1\xb4\x62\x90\x48\x12\xc2\xc3\x29\xf4\xc6\x4b\xca\xc7\xc6\x21\xbd\x12\x24\xdd\x5e\xc9\x7d\xdd\xf0\x7d\x7f\x57\xcc\x00\xa1\x1c\x8e\x21\xd5\x42\xfe\x9e\x9a\xe0\xa8\xd2\xad\x8c\x72\xfc\xb7\x24\x69\x4a\x79\x34\xb5\xc1\x70\xd6\x92\x4c\x8b\x67\x4c\x28\xfc\x45\x92\xe0\x0a\xb5\x6a\x77\xbe\xc3\x95\x44\x15\xd7\x9b\x63\xa4\x51\xac\x8d\x37\x32\x2d\xf2\x55\x27\x22\x34\x11\x22\x69\xca\x68\x60\x19\x35\x36\xe8\xb1\xbd\xdb\xba\x79\x32\xe3\xaf\xc5\xb2\x9d\xce\xde\x90\x04\x0b\x10\x31\xd4\x40\xab\x55\xa7\x24\xc2\xf0\x95\xc6\x44\x2d\xf2\x16\x17\x0f\xfd\x96\x44\x78\xee\xaf\x28\x0f\x5f\xf1\x10\xd7\xfd\x4b\x98\x9f\xc1\xa5\x6f\x00\x04\xf3\xf9\x1c\x0a\xb5\x33\xab\xd5\x8d\x5d\xf4\x72\xd2\x5e\xf4\xe0\x18\xe8\x39\xcc\xed\xba\x9c\x88\xc9\xbd\x12\x55\x2a\xb8\x32\x78\xb4\x44\xf1\x53\xa1\x74\xff\xf9\xaf\xef\x7e\x7f\x73\xf1\xf4\xed\xab\x8b\xb7\x4f\x3f\xfc\x03\x8e\xc1\x1b\x5f\x8a\xa5\x1a\x7b\x70\xdc\x9a\xa6\x18\xef\xe7\x89\xb0\x5f\x2d\x33\x24\x9a\x0c\xc1\xe5\x8e\x21\xc4\x48\x42\x94\x6a\x08\x0e\x26\x55\xa2\x7d\xd2\xf7\x7e\x4a\x50\x29\x12\xa1\x37\xf0\x63\x9d\xb0\xbe\x77\x1a\xd2\x6b\x08\xcc\x2b\x63\xde\x23\x0c\xa5\x06\xfb\x5b\x66\xdb\x15\x09\x11\x28\xef\x9d\xbd\xcf\x1b\x8a\xd4\x74\x29\x96\x50\x33\xd2\x58\x7e\x3a\x0e\xe9\xf5\x99\x97\xdb\x0b\x90\xa5\x21\xd1\xf8\x2f\x8a\x37\xfd\xb2\x6d\xaf\xb3\x2c\x99\x6c\x38\x9d\xa9\x3d\xbf\x61\x48\x6f\xe0\x87\x26\x91\xf4\xab\x94\xe2\x2b\x46\x43\xfc\x23\xed\xff\x3c\x99\xec\xbe\xee\x5a\x7a\x7a\x03\xf7\xb7\xef\x05\x06\x93\x95\x91\xdb\xfc\xbf\xed\x20\x9f\xbc\xf4\x33\x9a\xf7\xec\xff\xd6\xcb\xf9\xcb\xa8\x74\xf2\xe9\x32\xd3\x5a\x70\xd0\x9b\x14\xe7\x3d\xf7\xd0\x2b\x06\x5a\xc3\xc1\xfe\x8e\xdc\x9a\xc0\x98\x34\x0a\xa9\x4a\x68\xa9\xb9\x07\x44\x52\x32\x8a\x69\x18\x22\x9f\xf7\x6c\x2e\x38\x5b\x9f\x8e\x9d\xb2\xb3\x17\x66\x51\x77\x0f\xa2\xf3\x4e\x83\x66\x81\x44\x93\x3f\x76\x99\x56\x4f\x2d\x85\x3b\xb4\xdc\x94\x8e\xb9\xb4\x43\x8a\x0c\xbe\x92\x22\xb1\x49\xa7\x3d\x32\x9f\x18\x02\x62\x2b\x06\x94\xb2\xf2\xed\x0d\xe5\xa1\xb8\x29\x22\x69\x73\xd8\x4b\x21\x13\xa2\xc1\xae\xab\x8a\xaa\x7b\x5d\xd4\x5e\x94\xf7\x66\xa0\x37\x34\x06\x3f\x2c\xee\x39\xd7\x87\xf5\xb0\xb9\xa4\x74\x90\x7c\x8f\xb4\xfa\x16\xb4\xb2\xf1\x69\xf1\x6a\x4f\x80\x3a\x88\xe5\x22\xd6\x41\xac\xfb\x13\xea\x91\x48\xb7\x13\xc9\xba\xfa\x6e\x81\x7a\x64\xd2\xf7\x60\xd2\x3d\x02\xd4\xc1\xa4\x10\x19\x76\x32\xe9\xdb\x15\x83\xd6\x84\xfb\x54\x83\xce\xe6\x3f\x5d\x3d\xb8\xca\x18\xdb\x80\xdb\x43\x87\xf7\x2f\x0a\x1f\xd9\xf4\x4d\xca\x3d\x13\x9e\xcf\xad\xf7\xb4\x88\x22\x76\x88\x4c\x5f\xb4\xc1\xb1\x8d\x6e\x1a\xef\x01\x82\xdb\x59\xf6\x08\xee\x07\x0a\x6e\x17\x9e\x3b\x43\xfb\x28\x3f\x0a\xad\x42\xd5\xc0\xf5\xad\x80\x8e\x70\x7f\x95\xf3\xf5\x80\x5b\xaf\x06\xdd\xd9\x9d\x1d\xda\x00\xd4\x4f\x81\xe0\x7c\x64\xa3\xfa\xf9\x68\x6a\x2a\xf9\xde\x90\xa2\xe1\xbc\x57\x33\xe8\x21\x41\x2c\x42\x6d\x8b\x11\x33\x7e\x2f\xa8\xc6\x63\x08\x08\x0b\x32\x7b\xe6\x68\xaa\x09\xa0\x1c\x52\x46\x02\xac\x72\x69\x24\x45\x96\x7e\x10\xa6\xa4\x50\x9d\xb0\x2b\xe4\x48\x0a\x73\xf8\x8d\xe8\xd8\x97\x22\xe3\x61\xed\x64\x4e\xf9\x0c\x79\xa4\x63\x18\x17\xc2\xd4\x14\x2d\x6f\x51\x1a\xad\x8d\x2a\xa4\x56\xd3\xc0\x1c\x16\xe7\x79\x04\x57\x42\x42\xdf\xe0\xdb\x54\x3f\x93\x19\x50\x38\x85\x5d\xfd\x33\xa0\xc7\xc7\x55\xd8\xe8\x0a\xfa\x14\xfe\xbf\x6b\x4e\x5b\x05\x4d\x1a\xd8\xda\x29\xa9\xec\x52\x56\x4c\x08\xd9\xa7\x7b\x2c\x37\x35\xd2\xa2\x66\xc7\x82\x9e\x9f\x97\x28\x04\x64\x0a\xbf\x78\x06\x3f\xcd\x54\xdc\x6f\xce\x51\x21\xbd\x3a\x31\x6d\x9c\x2a\x1a\xcc\x35\x4f\xa5\xe9\x7f\xd0\x02\x5d\xea\x21\x20\x0f\x9b\x29\x43\xd7\x5d\x6d\xbc\x66\xc4\xe1\xb4\x2e\x08\xe6\x01\xe6\x60\x7a\x8a\xd9\xad\xba\xbc\x0d\x46\x35\x1c\xcc\x6a\x7b\xaf\x46\xe4\xec\x08\x17\x3d\xe4\x61\x2b\x5c\x12\xb5\x5b\x2c\x1d\xcc\x76\xaf\x0b\x24\xea\x9d\xd7\x7c\x2a\xf1\xda\x45\xb3\x03\x96\x66\x1d\xbb\x55\x31\x9c\xd5\xc3\xbe\xdb\x3f\x1a\xcd\xba\x7d\xca\x71\xad\xef\x3b\xd7\xe9\x6e\xcc\x0b\x26\x8c\xe0\xe4\x36\x33\x8e\x8f\xf7\x98\xa1\x70\xbf\x15\x1d\x16\xcc\x41\xc7\x54\xf9\xbc\x72\xdd\x78\x0c\x94\x53\x7d\xd4\xe2\xed\x64\xd6\x62\x7c\x93\x84\xd0\x4d\x22\x38\xf9\x5b\xad\x6f\x87\xba\x7b\x4c\x9a\x34\x16\xe4\xde\x39\x17\x81\xc8\xb8\x6e\x19\x62\xb3\x6a\x67\x8f\xbb\xdd\xba\x30\x7c\x68\xf5\xa8\xb2\x0c\xea\xea\xcd\x9b\x72\xb0\x77\xbc\xb6\x1a\x8e\xb5\xaf\xb0\x1a\x53\x3a\x6d\x75\x5d\x1d\xa6\xb6\x27\x35\xda\x72\x8e\xed\x5f\xc5\xed\xeb\xb0\x02\xe3\x71\x69\xa2\x82\x98\x5c\x23\x2c\x11\x39\x84\xa8\x02\x49\x97\x58\xdc\xdc\x80\x8e\xd1\xce\x69\x29\x18\x52\x95\x32\xb2\x69\x24\xec\x5a\x62\x2f\x4b\x3f\x4b\xd7\x5a\x92\x35\x0a\xba\xb3\x6b\xdb\x19\xcd\xe7\x63\x3b\x72\x41\xcf\x9b\x01\x2e\x52\x47\xd3\x5d\xf5\xa7\x6a\x60\xad\xb5\x2c\x23\x0c\xd1\x38\xde\xc0\x73\x62\xf6\x9d\x44\x1b\xd0\x49\x85\xfd\x62\x0c\x23\x4a\x5f\xe4\x33\x0e\x06\x70\x06\x07\x85\xed\x2c\x83\x41\xc7\xab\x60\x37\x02\x7b\x3a\x8e\xe1\xe4\x50\xd2\x6f\x46\xba\xa3\xb1\xae\x23\x67\x7e\x07\x1a\xba\x9d\xdd\xc0\xcd\x5e\xcf\x96\x2f\xfd\x66\xc1\xbf\xed\xbe\x37\x7d\x61\xef\xed\x0c\xc4\x3e\xff\xea\xf4\xce\x77\x5c\xed\x0b\x96\x4b\xb1\xec\x3d\x5e\x46\xed\xf7\xcb\xf7\xba\x77\x2a\xcf\x60\x99\x70\xb7\x9a\xbe\x44\x26\x48\xd8\xff\xb1\x77\x73\xf7\xbf\x99\xda\x43\x3a\x7b\x58\x77\x90\x6f\x9a\x26\x28\x32\x3d\x84\x27\xc8\x30\x41\xae\x1b\x6c\x13\xad\xab\x6e\x89\x3c\x44\x89\x72\x0a\x1e\xa3\x1c\x3d\x77\x41\x6d\x39\x9b\x0a\x66\xa3\x98\x77\x11\xe9\xed\x56\x1b\x92\xda\xaa\x7f\x51\xff\x1c\xc1\x2b\xef\x76\x4c\x5e\xf1\x8a\x2f\x03\x98\x30\x93\x44\x12\x91\xe7\x6d\xc6\xa1\x53\x58\x7c\x82\xf5\x14\x26\x43\xd8\x4c\x61\x02\xdb\x73\x33\xc9\xb0\xf1\x7d\x83\x97\x5f\x45\x74\xa8\x93\x18\x1e\x54\x56\xaf\x34\x56\x48\x74\x26\xb1\x5a\x7f\x2c\xae\xcd\xe2\x0b\x3c\xad\xdd\x95\x81\x36\x6d\x95\x8b\xd7\x75\x1e\xe4\x05\xe7\xba\xc4\xf4\x30\xff\x67\xd3\x39\x76\xd3\x31\x76\xd3\xca\xe5\xc3\xfc\xf4\x36\x42\x1e\x56\xb6\xb8\x53\x80\xc6\x37\x19\x00\x31\x8d\x62\xe6\xbe\x28\x30\x68\xab\x8f\xdf\x3c\x5d\x53\x55\x1b\x4e\x83\x2b\x67\xd1\x14\xde\xe5\xdf\x5c\xf9\x2f\xe9\xda\xae\xdf\x7f\x93\x25\x4b\x94\xfe\xca\x0a\xfc\xfa\xdb\x2f\x1f\xea\x9a\xd6\x5f\xa4\x69\x58\x0e\x4b\xf0\x0f\x4e\xf5\x14\xbc\x58\x64\xd2\x6b\x55\xac\x7f\x8e\xd3\x8a\xbf\x4b\x92\xc6\xed\xc3\x8a\x9c\x62\xfd\xee\x44\xd9\xf5\x8d\xc0\xb6\xfc\x08\xe9\x87\x4b\x7f\xb7\x9f\x34\x94\xb1\x4e\x3e\x1e\x8a\x72\x82\x06\x68\x65\xa0\x93\x8f\x9f\x1f\xe2\xf2\x82\x51\xc8\x17\x24\x88\xf3\x61\x95\x1a\x5b\xae\x5c\x61\x83\xbb\xc5\xf7\x7e\xd7\x84\xf9\xef\x5b\xdf\xfb\x41\xf1\x1d\xdc\x64\x5a\x6b\x71\x49\x69\x71\x85\x9b\x73\xbf\xdc\x3e\xf4\xb8\xe0\xd8\x9b\x35\xc4\x96\x12\xc9\xd5\xac\xad\xeb\xe4\xb0\x2e\xc2\xe8\xf5\xdd\x94\xfd\x7c\x58\x19\x43\x72\x4d\x79\x74\x27\x75\x7f\xb9\x8b\xba\x95\xbe\x93\xae\xbf\x1e\xd6\xe5\x4a\xe1\xdb\xb5\x6d\x5b\x35\x46\x49\xe4\x1c\x37\xe5\x16\x0b\xea\xd0\x4b\x3e\xfe\xb8\xdc\xcb\x0b\xfe\x87\xb6\xd3\xb6\x29\xf7\xd6\x8d\x76\x64\xf7\xad\xf3\x66\x19\xb2\x98\x9c\xfb\x55\x80\x8d\x98\xbb\xcf\xdc\x95\x32\xed\x95\x94\x2d\x25\xba\xc4\x6c\xc7\xec\xb3\x77\xf7\xf6\xab\x68\xba\x5a\xd5\xb6\xe6\x5d\x1b\x7e\xf8\xd2\xfd\xfe\xe3\x96\xfc\xc1\x6c\xc9\xa1\x79\xd6\xd7\xf4\xef\xff\x35\x4e\x94\x73\x64\x34\x45\x46\x9d\x5c\xac\x9f\x76\xde\x6d\xbf\x6f\x45\x2d\x49\xdc\x89\xa9\x2d\x8a\xed\xf3\x22\xaa\xc1\x03\x46\x70\x72\xee\xaf\xcd\x4a\x6c\xc1\x6c\x6d\xda\x0e\x9a\x27\x0b\x05\x1d\xca\x8a\xb9\xa8\xca\xcd\x6f\x51\xea\xe5\xe5\xb8\xfd\x53\xb4\xb9\x82\xdc\xce\xe7\x16\x50\xb7\x6b\x87\x6f\x27\x75\xf2\x76\x12\xf7\xa4\x4e\xdc\x6e\xd2\x9e\x94\xa4\x6d\x87\xa2\x8e\xd7\xce\x40\xd4\x05\x46\x1d\x69\xaf\x23\x08\xb7\x1c\xa5\x7c\xfd\x00\x9c\x7c\x95\x00\xec\x3d\xe2\xf9\x6f\x00\x00\x00\xff\xff\xf2\x96\xb4\xee\xc3\x31\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\xdb\x72\xdb\x38\xd2\xbe\xf7\x53\x74\x69\xf2\x17\xa5\xb2\x44\x29\xf3\xef\xde\x48\x96\xab\x32\x39\xec\x26\xb3\x93\x49\x25\x99\xdd\x0b\x95\xca\x05\x91\x2d\x12\x36\x08\x30\x00\x28\x4b\x9b\xd2\xbb\x6f\x01\xe0\x59\x94\x4f\xd9\x4d\x32\x15\xdf\xc8\x26\xd8\x68\x34\xba\xbf\xaf\xd1\x00\xb8\x21\x12\xc2\x2b\x29\x38\xcc\x81\xf0\x28\x63\x44\xfa\x89\x08\x33\x86\x7d\xcf\xb6\x7b\x43\x58\x78\xf9\x9b\x91\xa4\xc1\x95\x8a\xc9\xb5\x37\x04\x2f\xa3\x7e\x20\x42\x4c\xa8\x94\x42\x7a\xcb\xc1\xec\xe4\xc4\x76\xf0\xd7\x94\x69\x94\x7d\x4f\x69\xa2\x33\xf5\x9c\x11\xa5\xbc\x21\xac\x33\x1e\x68\x2a\x38\xf4\x07\xf0\xf9\x04\xc0\x0c\xbc\x96\x14\x79\xc8\x76\x1f\xac\xe4\x2b\xdb\x0f\xe6\x35\xd1\x4b\xb1\x72\xd2\x00\x74\x6d\x1f\xfd\x90\x2a\xb2\x62\x18\x16\xed\x00\x12\x75\x26\x39\x78\x1a\xb7\x7a\x94\x64\x1a\x43\x88\xd8\x2e\x8d\x69\x20\xf8\x68\x45\xf8\x28\xa0\x32\x60\xe8\x59\xf1\xbd\xfd\x55\xd7\x54\x07\xb1\x53\xe8\xcc\xac\xd4\x05\x44\x21\x78\x2a\x0b\x02\x54\xca\x9b\xe6\xad\xd5\x30\x4e\x7e\x94\x0b\xd4\x86\x12\x57\x23\x45\x23\xee\x35\xf4\xac\x09\x65\x18\x1e\x57\x13\x12\x1e\xa1\xac\x69\x91\x98\x88\x0d\x76\x68\x4a\x89\xd4\x94\x30\xb6\xbb\xb8\x4d\xe7\x35\x91\x9c\xf2\xa8\xa6\x14\xb7\x01\x23\x09\x31\x4e\xed\xd0\x2c\x33\x6e\xe4\x8f\x2b\xcc\x05\x6a\x0a\x53\x46\x76\x1d\x7e\xcd\xfb\x51\x9e\x66\x7a\x76\x02\xb0\x37\x3f\x79\x63\x57\xb0\x67\x27\xfb\x0a\x37\x81\xe0\x4a\x13\xae\xfb\x5e\x4c\x43\x7c\x81\x8c\xec\xbc\x21\xfc\x3c\x99\x4c\x1a\x32\x5a\x0a\xc6\x0c\xbe\xde\x88\xd5\x3f\xa8\xd2\xcf\xb5\x64\x0d\x7c\x3d\x51\x81\x48\x71\x08\x4f\x62\xad\xd3\x21\x3c\xa1\x5c\xa3\xdc\x10\x36\x84\x52\xaf\x8b\xf6\x78\x0c\xa9\x44\xad\x77\x70\xa9\x04\xb7\x1a\x4e\x00\x5c\x77\x5f\x8b\x37\xca\xb2\xa2\x52\xac\xb4\x2c\x60\x92\xcf\xa9\x60\x8c\x13\x36\x02\x43\xd0\x32\xc3\x81\x9d\x7c\xa5\xec\x52\xac\x3e\x62\x92\x32\xa2\x11\xe6\xb9\x0a\x4e\x12\x9c\x42\xef\x52\xac\x7a\x43\x07\xca\x20\x46\x43\xbc\x29\xf4\xf2\x16\x71\xcd\x51\xb6\x1e\x2f\x30\x21\x94\x55\x8d\x05\x1f\xa6\xb0\x26\x4c\xa1\x6b\xd4\x24\x52\x53\xf8\xbc\x1f\x16\xc6\x4a\x8a\x6a\x0a\x13\xf7\x9c\x4a\x61\xa0\x2b\xa4\x9a\x02\xcf\x18\x73\xad\x81\xe0\x41\x26\x25\xf2\x60\x37\x85\x1e\x61\x4c\x5c\xe7\x43\xe0\x16\x83\x4c\x0b\x63\x89\x8a\x91\xb1\x56\xf3\x45\x20\xf8\x9a\x46\xd3\x8a\x41\x22\x49\x08\x0f\xa7\xd0\x1b\xaf\x28\x1f\x1b\x87\xf4\x4a\x90\x74\x7b\x25\xf7\x75\xc3\xf7\xfd\x43\x31\x03\x84\xb2\x3b\x86\x54\x0b\xf9\x7b\x6a\x82\xa3\x4a\xb7\x32\xca\xf1\x5f\x92\xa4\x29\xe5\xd1\xd4\x06\xc3\x59\x4b\x32\x2d\x9e\x33\xa1\xf0\x17\x49\x82\x2b\xd4\xaa\xfd\xf2\x3d\xae\x25\xaa\xb8\xde\x1c\x23\x8d\x62\x6d\xbc\x91\x69\x91\xcf\x3a\x11\xa1\x89\x10\x49\x53\x46\x03\xcb\xa8\xb1\x41\x8f\x7d\xbb\xaf\x9b\x27\x33\xfe\x46\xac\xda\xe9\xec\x2d\x49\xb0\x00\x11\x43\x0d\xb4\x9a\x75\x4a\x22\x0c\x5f\x6b\x4c\xd4\x22\x6f\x71\xf1\xd0\xef\x48\x84\x4b\x7f\x4d\x79\xf8\x9a\x87\xb8\xed\x5f\xc2\xfc\x1c\x2e\x7d\x03\x20\x98\xcf\xe7\x50\xa8\x9d\x59\xad\xae\xef\xa2\x97\x93\xf6\xa2\x07\xa7\x40\x97\x30\xb7\xf3\x72\x22\x26\xf7\x4a\x54\xa9\xe0\xca\xe0\xd1\x12\xc5\x4f\x85\xd2\xfd\x17\xbf\xbe\xff\xfd\xed\xc5\xb3\x77\xaf\x2f\xde\x3d\xfb\xf8\x77\x38\x05\x6f\x7c\x29\x56\x6a\xec\xc1\x69\x6b\x98\xa2\xbf\x9f\x27\xc2\x7e\x35\xcd\x90\x68\x32\x04\x97\x3b\x86\x10\x23\x09\x51\xaa\x21\x38\x98\x54\x89\xf6\x49\xdf\xfb\x29\x41\xa5\x48\x84\xde\xc0\x8f\x75\xc2\xfa\xde\x59\x48\x37\x10\x98\x25\x63\xde\x23\x0c\xa5\x06\xfb\x5b\x66\xdb\x35\x09\x11\x28\xef\x9d\x7f\xc8\x1b\x8a\xd4\x74\x29\x56\x50\x33\xd2\x58\x7e\x36\x0e\xe9\xe6\xdc\xcb\xed\x05\xc8\xd2\x90\x68\xfc\x27\xc5\xeb\x7e\xd9\x76\xd4\x59\x96\x4c\x36\x9c\xce\xd4\x9e\xdf\x30\xa4\x37\xf0\x43\x93\x48\xfa\x55\x4a\xf1\x15\xa3\x21\xfe\x91\xf6\x7f\x9e\x4c\x0e\x97\xbb\x96\x9e\xde\xc0\xfd\xed\x7b\x81\xc1\x64\x65\xe4\x3e\xff\x6f\x3f\xc8\x07\x2f\xfd\x8c\x66\x9d\xfd\xdf\x7a\x39\x5f\x8c\x4a\x27\x9f\xad\x32\xad\x05\x07\xbd\x4b\x71\xde\x73\x0f\xbd\xa2\xa3\x35\x1c\xec\xef\xc8\xcd\x09\x8c\x49\xa3\x90\xaa\x84\x96\x9a\x7b\x40\x24\x25\xa3\x98\x86\x21\xf2\x79\xcf\xe6\x82\xf3\xed\xd9\xd8\x29\x3b\x7f\x69\x26\x75\xf7\x20\x3a\xef\x34\x68\x16\x48\x34\xf9\xe3\x90\x69\xf5\xd4\x52\xb8\x43\xcb\x5d\xe9\x98\x4b\xdb\xa5\xc8\xe0\x6b\x29\x12\x9b\x74\xda\x3d\xf3\x81\x21\x20\xb6\x62\x40\x29\x2b\xdf\x5e\x53\x1e\x8a\xeb\x22\x92\x36\x87\xbd\x12\x32\x21\x1a\xec\xbc\xaa\xa8\xba\xe5\xa2\xb6\x50\xde\x9b\x81\xde\xd0\x18\xfc\x7d\x71\xcf\xb9\x3e\xac\x87\xcd\x25\xa5\x5b\xc9\xf7\x48\xab\xaf\x41\x2b\x1b\x9f\x16\xaf\x8e\x04\xa8\x83\x58\x2e\x62\x1d\xc4\xba\x3f\xa1\x1e\x89\x74\x33\x91\xac\xab\xef\x16\xa8\x47\x26\x7d\x0b\x26\xdd\x23\x40\x1d\x4c\x0a\x91\x61\x27\x93\xbe\x5e\x31\x68\x4d\xb8\x4f\x35\xe8\x6c\xfe\xd3\xd5\x83\xeb\x8c\xb1\x1d\xb8\x3d\x74\x78\xff\xa2\xf0\x91\x4d\x5f\xa5\xdc\x33\xe1\x79\x68\xbd\xa7\x45\x14\xb1\xdb\xc8\xf4\x45\x1b\x1c\xdb\xe8\x86\xf1\xbe\x43\x70\x3b\xcb\x1e\xc1\xfd\x9d\x82\xdb\x85\xe7\xce\xd0\x3e\xc9\x8f\x42\xab\x50\x35\x70\x7d\x23\xa0\x23\x3c\x5e\xe5\xfc\xf7\x80\x5b\xaf\x06\xdd\xd9\x9d\xed\xda\x00\xd4\x4f\x81\xe0\x7c\x64\xa3\xfa\x70\x34\x35\x95\x7c\x6b\x48\xd1\x70\xde\xab\x19\xf4\x3d\x41\x2c\x42\x6d\x8b\x11\xd3\xff\x28\xa8\xc6\x63\x08\x08\x0b\x32\x7b\xe6\x68\xaa\x09\xa0\x1c\x52\x46\x02\xac\x72\x69\x24\x45\x96\x7e\x14\xa6\xa4\x50\x9d\xb0\x2b\xe4\x48\x0a\x73\xf8\x8d\xe8\xd8\x97\x22\xe3\x61\xed\x64\x4e\xf9\x0c\x79\xa4\x63\x18\x17\xc2\xd4\x14\x2d\xef\x50\x1a\xad\x8d\x2a\xa4\x56\xd3\xc0\x1c\x16\xcb\x3c\x82\x6b\x21\xa1\x6f\xf0\x6d\xaa\x9f\xc9\x0c\x28\x9c\xc1\xa1\xfe\x19\xd0\xd3\xd3\x2a\x6c\x74\x0d\x7d\x0a\xff\xd7\x35\xa6\xad\x82\x26\x0d\x6c\x1d\x94\x54\x76\x2a\x6b\x26\x84\xec\xd3\x23\x96\x9b\x1a\x69\x51\xb3\x63\x41\x97\xcb\x12\x85\x80\x4c\xe1\x17\x8f\xe0\xa7\x99\x8a\xfb\xcd\x31\x2a\xa4\x57\x27\xa6\x8d\x53\x45\x83\xb9\xe6\xa9\x34\xfd\x37\x5a\xa0\x4b\x3d\x04\xe4\x61\x33\x65\xe8\xba\xab\x8d\xd7\x8c\x38\x9c\xd5\x05\xc1\x3c\xc0\x1c\xcc\x9b\x62\x74\xab\x2e\x6f\x83\x51\x0d\x07\xb3\xda\xde\xab\x11\x39\xdb\xc3\x45\x0f\x79\xd8\x0a\x97\x44\xed\x26\x4b\x07\xb3\xc3\xeb\x02\x89\xfa\x60\x99\x4f\x25\x6e\x5c\x34\x3b\x60\x69\xe6\x71\x58\x15\xc3\x79\x3d\xec\x87\xef\x47\xa3\x59\xb7\x4f\x39\x6e\xf5\x7d\xc7\x3a\x3b\x8c\x79\xc1\x84\x11\x3c\xbd\xc9\x8c\xd3\xd3\x23\x66\x28\x3c\x6e\x45\x87\x05\x73\xd0\x31\x55\x3e\xaf\x5c\x37\x1e\x03\xe5\x54\x9f\xb4\x78\x3b\x99\xb5\x18\xdf\x24\x21\x74\x93\x08\x9e\xfe\xb5\xf6\xee\x80\xba\x47\x4c\x9a\x34\x26\xe4\xd6\x9c\x8b\x40\x64\x5c\xb7\x0c\xb1\x59\xb5\xf3\x8d\xbb\xdd\xba\x30\x7c\x68\xbd\x51\x65\x19\xd4\xf5\x36\x6f\xca\xc1\xde\xb1\x6c\x35\x1c\x6b\x97\xb0\x1a\x53\x3a\x6d\x75\xaf\x3a\x4c\x6d\x0f\x6a\xb4\xe5\x1c\x3b\x3e\x8b\x9b\xe7\x61\x05\xc6\xe3\xd2\x44\x05\x31\xd9\x20\xac\x10\x39\x84\xa8\x02\x49\x57\x58\xdc\xdc\x80\x8e\xd1\x8e\x69\x29\x18\x52\x95\x32\xb2\x6b\x24\xec\x5a\x62\x2f\x4b\x3f\x4b\xd7\x5a\x92\x35\x0a\xba\xb3\x6b\xdb\x19\xcd\xe7\x53\xdb\x73\x41\x97\xcd\x00\x17\xa9\xa3\xe9\xae\xfa\x53\xd5\xb1\xd6\x5a\x96\x11\x86\x68\x1c\xaf\xe1\x05\x31\xfb\x4e\xa2\x0d\xe8\xa4\xc2\x7e\xd1\x87\x11\xa5\x2f\xf2\x11\x07\x03\x38\x87\x5b\x85\xed\x28\x83\x41\xc7\x52\x70\x18\x81\x23\x2f\x4e\xe1\xe9\x6d\x49\xbf\x19\xe9\x8e\xc6\xba\x8e\x9c\xf9\x1d\x68\xe8\x76\x76\x03\x37\x47\x3d\x5b\x2e\xfa\xcd\x82\x7f\xdf\x7d\x6f\xfa\xd2\xde\xdb\x19\x88\x3d\xfc\xea\xf4\xce\x77\x5c\xed\x0b\x96\x4b\xb1\xea\x3d\x5e\x46\x1d\xf7\xcb\xb7\xba\x77\x2a\xcf\x60\x99\x70\xb7\x9a\xbe\x44\x26\x48\xd8\xff\xb1\x77\x73\xf7\xbf\x99\x3a\x42\x3a\x7b\x58\x77\x2b\xdf\x34\x4d\x50\x64\x7a\x08\x4f\x90\x61\x82\x5c\x37\xd8\x26\x5a\x57\xdd\x12\x79\x88\x12\xe5\x14\x3c\x46\x39\x7a\xee\x82\xda\x72\x36\x15\xcc\x46\x31\x7f\x45\xa4\x77\x58\x6d\x48\x6a\xab\xfe\x45\xfd\x73\x04\xef\x7d\xfe\x2d\x48\xf1\x4d\x00\x13\x46\x7d\x24\x11\x79\xde\x66\x5c\x39\x85\xc5\x67\xd8\x4e\x61\x32\x84\xdd\x14\x26\xb0\x5f\x1a\xf5\xf5\xb2\x60\x8d\x44\x67\x12\x2b\x63\x63\xb1\x31\x96\x16\xc1\xdf\xba\xf3\x7d\x6d\xda\x2a\x7f\x6c\xeb\xa0\xcd\xab\xc3\x6d\x09\xc0\x61\xfe\xcf\xae\xb3\xef\xae\xa3\xef\xae\x95\x78\x87\xf9\x51\x6b\x84\x3c\xac\x6c\x71\x5b\xf6\xc6\x07\x14\x00\x31\x8d\x62\xe6\xae\xff\x0d\x34\xea\xfd\x77\xcf\xb6\x54\xd5\xba\xd3\xe0\xca\x59\x34\x85\xf7\xf9\x07\x52\xfe\x2b\xba\xb5\xf3\xf7\xdf\x66\xc9\x0a\xa5\xbf\xb6\x02\xbf\xfe\xf6\xcb\xc7\xba\xa6\xed\x17\x69\x1a\x96\xdd\x12\xfc\x83\x53\x3d\x05\x2f\x16\x99\xf4\x5a\xe5\xe5\x9f\xe3\x68\xe1\x6f\x92\xa4\x71\xfb\x64\x21\xe7\x43\xbf\x3b\xab\x75\x5d\xe8\xef\xcb\x2f\x86\x7e\xb8\x5c\x75\xf3\xb1\x40\x19\xeb\xe4\xd3\x6d\x51\x4e\xd0\x00\xad\x0c\x74\xf2\xe9\xe1\x21\x2e\x6f\x03\x85\x7c\x49\x82\x38\xef\x56\xa9\xb1\xb5\xc5\x15\x36\xb8\x5b\x7c\x9c\xb7\x21\xcc\xff\xd0\xfa\x38\x0f\x8a\x8f\xd6\x26\xd3\x5a\x8b\x4b\x4a\x8b\x2b\xdc\x2d\xfd\xb2\xd6\xef\x71\xc1\xb1\x37\x6b\x88\xad\x24\x92\xab\x59\x5b\xd7\xd3\xdb\x75\x11\x46\x37\x77\x53\xf6\xf3\xed\xca\x18\x92\x0d\xe5\xd1\x9d\xd4\xfd\xff\x5d\xd4\xad\xf5\x9d\x74\xfd\xe5\x76\x5d\xae\x6e\xbd\x59\xdb\xbe\x55\x10\x94\x44\xce\x71\x53\xee\x87\xa0\x0e\xbd\xe4\xd3\x8f\xcb\xbd\xbc\x3a\xff\x9a\xdb\xe2\x46\x8d\x6e\x4b\x98\x56\xf3\x0d\xdb\x65\x9b\x8a\x6f\xdc\x2d\x47\x76\xf3\x39\x6f\xd6\x12\x8b\xc9\xd2\xaf\x02\x6f\xc4\xdc\xa5\xe4\xa1\x94\x69\xaf\xa4\x6c\x91\xd1\x25\x66\x5f\xcc\x1e\xbc\x45\xb7\x0b\x5b\x6b\xf2\xdd\x1b\x77\xf8\xd2\x7d\xfb\xe3\xd6\xfa\x3b\xd8\x5a\xd7\x26\x5b\x7a\x31\x4f\x6c\xf3\xea\x23\xe7\x46\x95\x58\xa2\xa3\xf8\xaf\x63\xaf\x7e\x38\xb7\x63\x5b\x75\x2b\x6a\xa9\xe1\x0e\x3b\x6d\x89\x6c\x9f\x17\x51\x0d\x11\x30\x82\xa7\x4b\x7f\x6b\xc6\xb2\xe5\x73\x31\xf6\x7e\xd0\x3c\x17\x28\x78\x50\x96\xd0\x45\x91\x6e\x7e\x8b\xda\x2f\xaf\xd0\xed\x9f\xa2\xcd\x55\xe8\x76\x48\x37\x87\x26\xf4\x1f\x72\x8c\xf0\x9f\x00\x00\x00\xff\xff\xf6\x1e\xdf\x06\x27\x30\x00\x00"), }, "/js/jquery.min.js": &vfsgen۰CompressedFileInfo{ name: "jquery.min.js", diff --git a/dkron/templates/templates_vfsdata.go b/dkron/templates/templates_vfsdata.go index 8091a3b19..334706f2d 100644 --- a/dkron/templates/templates_vfsdata.go +++ b/dkron/templates/templates_vfsdata.go @@ -21,7 +21,11 @@ var Templates = func() http.FileSystem { fs := vfsgen۰FS{ "/": &vfsgen۰DirInfo{ name: "/", +<<<<<<< HEAD modTime: time.Date(2019, 1, 30, 20, 19, 45, 952386193, time.UTC), +======= + modTime: time.Date(2019, 3, 13, 21, 50, 30, 964673670, time.UTC), +>>>>>>> Main graph showing running jobs }, "/dashboard.html.tmpl": &vfsgen۰CompressedFileInfo{ name: "dashboard.html.tmpl", @@ -46,8 +50,13 @@ var Templates = func() http.FileSystem { }, "/jobs.html.tmpl": &vfsgen۰CompressedFileInfo{ name: "jobs.html.tmpl", +<<<<<<< HEAD modTime: time.Date(2019, 3, 12, 16, 50, 23, 955540252, time.UTC), uncompressedSize: 7191, +======= + modTime: time.Date(2019, 3, 13, 21, 50, 30, 965359195, time.UTC), + uncompressedSize: 6912, +>>>>>>> Main graph showing running jobs compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x59\xef\x8e\xdb\xb8\x11\xff\xbe\x4f\x31\x61\x16\xb1\x8d\x44\xf6\x05\x38\xa0\xc0\x46\xf2\xe1\x90\xb4\x48\x17\xbb\x97\x43\xb3\xed\x87\x16\x45\x8e\x12\xc7\x16\x53\x9a\x14\x48\x6a\x77\x0d\xc7\x4f\xd4\x47\xe8\xb7\x7b\xb2\x82\xa4\x64\xfd\xb1\xfc\x27\x69\x82\xa2\xc5\xed\x07\x4b\x22\x87\xa3\x99\xdf\xfc\x66\x38\xd4\x6e\x36\x0c\x17\x5c\x22\x90\x4c\x49\x8b\xd2\x92\xed\xf6\x22\x66\xfc\x1e\x32\x41\x8d\x49\xfc\x30\xe5\x12\x35\xd4\x02\x20\x97\x91\xbb\xd7\x4a\x08\xd4\x09\xb9\x56\xe9\x0d\x37\xf6\xb5\xd5\x82\xcc\x2f\x00\x36\x1b\x8b\xab\x42\x50\x8b\x40\x8c\xa5\xb6\x34\x04\xa6\xdb\xed\x05\x40\x5b\xaf\x56\x0f\x5e\x1a\x20\x5e\x28\xbd\x0a\xb7\x5d\x11\x37\x1e\x2d\xb5\x2a\x0b\x52\x4f\x77\x05\xb8\x2c\x4a\xbb\x27\x71\x50\x26\xa2\x8c\x29\x49\xe6\x31\xaf\x27\x97\x62\x5d\xe4\x3c\x53\x12\x76\x77\x91\x41\xaa\xb3\x9c\xcc\xe3\x19\x9f\xc7\x33\xc6\xef\x3b\x9a\xbd\x3a\xb0\xeb\x02\x13\x62\xf1\xd1\x92\x8e\xb1\x15\x2c\x04\x0a\x41\x33\xcc\x95\x60\x0e\xa0\x3f\x70\x61\x51\x7b\xdc\x56\x8a\xa1\x48\x48\x78\xc7\xb5\x4a\x3f\xc7\xec\x96\x24\x40\x4c\x21\xd7\xb8\x48\xc8\x53\x02\x8c\x5a\x1a\x59\xb5\x5c\x0a\x4c\xc8\x4a\x31\x2a\xea\x31\xaa\x97\x68\x13\xf2\xf4\xa3\x4a\xef\xaa\x98\xdc\x86\x79\xcb\xad\x93\xfe\x09\x1f\x1c\x1e\x1d\xd5\xee\xef\x08\x3e\x85\x70\x01\xa5\x9a\xd3\x28\xe7\x8c\xa1\x4c\x88\xd5\x25\xd6\x80\xd1\x8e\x47\x5d\xfc\x3a\x8f\xad\x87\x78\xd6\x50\x20\xb6\x34\x15\x58\x1b\x10\x1e\xfc\x6f\x64\xac\xe6\x05\xb2\x1d\x10\xb1\xcd\x91\xb2\x96\x76\xab\x3b\xef\xb6\xf9\xfc\x5a\xa5\xf1\xcc\xe6\xfd\xe1\xf7\x59\x8e\xac\x14\x38\x38\x57\x66\x19\x1a\x33\x34\xf5\x7b\xad\x95\x1e\x9a\xb8\xa1\xc6\x02\x3e\x62\x56\x5a\xae\xe4\x90\xc4\x4f\xf8\x78\x42\xe2\xbd\xcf\x94\xa1\x99\x1f\x33\xb7\xa6\x37\x15\xcf\x1a\x6f\xdd\x4c\x0b\x89\xd8\x2e\x94\xb2\x6d\x5c\x18\x64\x4a\x98\x82\xca\x84\xfc\xee\x20\xe3\x8a\x52\x88\x48\xf3\x65\x6e\xfb\x54\x2b\xc5\x4e\x86\x2e\xb9\xa4\xce\x9c\x9e\x0c\x40\x2c\xb8\x2f\x0c\x41\x70\xc3\xb8\x71\x41\x63\x57\x90\x95\x5a\xa3\xb4\x3f\xd3\x25\x42\x92\xc0\x77\xdb\xbd\xa5\x3b\x36\x07\x05\x3c\xfb\x47\x42\x0a\x8d\xf7\x6e\xc9\x78\x42\xe6\xbf\xfe\x13\x7e\xd6\x78\xdf\xe3\x56\xf0\x5c\xf0\xf9\xc5\xb0\x25\x1a\x0b\xa4\x36\x21\x12\xb8\x04\x4d\xe5\x12\xc7\x05\x5d\x22\xfb\xa3\xc5\x95\x99\x0a\x94\x4b\x9b\xbf\x68\x5b\xd7\x79\x80\xe7\xb0\xa4\xc5\x04\xc8\x9e\xad\x2d\x27\x69\x66\xf9\x3d\x5e\x81\x74\x8e\xb5\x16\x6f\x49\xcb\x13\x83\xb6\x76\xe4\x98\xdf\x29\x97\xcc\x19\xfb\x1c\x5e\x92\x7e\x1a\x9d\x72\x75\x1f\xf4\x71\xcb\x9a\x89\xb3\x6e\xcf\x75\x88\xe0\xe5\x79\xa1\x90\xf8\xb8\xf3\xc0\xf3\xf8\xd7\x7f\x1d\xb4\xaf\x3b\x52\x8a\xa3\xc5\xc0\xb2\x16\x83\xdb\x9c\x8d\x6d\xaa\xd8\xba\x93\xd9\xed\x88\x7e\x54\xa9\x8b\x69\xe3\xd2\xdf\x5a\xde\xfe\x1d\x3e\xc1\xc2\x17\xdc\xab\x03\x55\xd6\xb2\x79\x4c\x9d\xbe\x50\x40\x3f\xaa\xd4\xcc\x36\x9b\x5f\x36\x1b\xf8\xa8\xd2\xa9\xa4\x2b\x84\xed\xf6\x97\xed\x76\xb6\xcb\x57\x43\x9a\x08\xd5\x32\x21\x48\x6d\x27\x2a\xe5\x5d\x51\x53\x95\x1a\x72\x86\x68\xa8\x3c\x1f\x32\x55\x4a\x7b\x86\x3c\xba\x72\x74\x44\xba\x13\x8c\xdd\xca\xb1\x5b\x2a\xa8\xb1\x1f\xaa\xf7\xc1\x1c\x76\x43\x5e\x25\xfc\x00\x7b\x32\x57\x3d\x99\x09\x7c\x72\x5b\x0c\x5e\x8d\xd6\xeb\xf5\x3a\xba\xbd\x8d\x18\x83\xb7\x6f\xaf\x56\xab\x2b\x63\xe0\xaf\xa3\x2e\xe2\xa7\x3c\x71\x0c\x3b\xa9\x70\x40\x4b\x8f\x6f\xed\x5c\x70\x1c\xf9\x04\xa1\xfd\x78\xed\x86\xc8\xde\x9e\x16\x76\xac\xe3\x76\xee\x6d\xba\x3b\xda\x3c\x0d\x94\xb9\xe4\x92\xe1\x63\x20\x4c\xd4\xd9\x7b\x8f\xed\xc7\x07\xd7\xf6\x92\xaa\xda\xa5\xff\xc2\xf1\x61\xbf\xe0\x1e\xed\x62\x70\x8d\x91\x2a\x50\x1e\xdc\xa9\x7b\xa9\xda\xcb\xe7\x67\x32\x35\xc5\xab\x83\x1d\x47\x53\x1c\x74\x29\xaf\x55\x3a\xae\xb3\x62\xe2\xe7\x4c\xae\x1e\x12\xf2\x44\x97\x52\x72\xb9\xfc\xb0\xef\xed\xae\xff\xf8\x53\x29\x3f\xbf\xff\xa0\xeb\x73\xfb\x8f\x8e\xd5\x27\xfa\xbe\x4c\x2d\x41\x2a\xbd\xa2\xd5\x2e\x18\x99\x82\x4b\x89\x7a\x70\x07\x08\x1e\x1e\x71\x70\xd8\x9a\xb3\x61\x0d\xec\xe9\x21\x5b\x61\x76\xe7\xe7\x4e\xb9\x53\xd0\xd2\xe0\xbe\xed\xe7\xe2\x76\xc2\xd2\x2f\xa7\x78\xc4\x50\xa0\xdd\xb3\xac\x61\x8d\x9f\x3f\x41\x9b\x37\x41\xc7\x09\x08\xac\xa6\x26\xff\x72\x08\x76\xfe\x7e\x03\xe6\x1c\x73\x72\xb8\x91\x6e\xd7\xa2\x5e\xf3\xd7\x6c\x96\xf1\xcc\xb7\xca\x55\x9f\x10\x3f\x89\x22\xf0\xfd\x3e\x04\xc0\x20\x8a\x2a\x39\xd7\xf7\xfd\x47\x3b\x6a\x8d\x87\x8f\x29\x2c\x28\xdb\x45\x94\xb3\x84\x9c\x0a\xbe\xeb\xe8\xfd\x64\x42\xa2\x97\x04\xb4\x72\x41\x65\x9c\x0a\xb5\xac\x52\x5b\xd0\x14\x85\x40\x96\xae\x13\xb2\x5a\x7b\x27\x6e\xdc\x10\x19\x3a\x28\x56\xba\xab\xf5\x95\x36\x95\x95\x2b\x77\x5c\x1d\x3e\x3a\x86\x25\xf5\x91\xf6\x50\x4f\x1c\xa4\x1c\xbe\xbd\xf2\xfb\xa3\x46\x58\xab\x12\x4c\xa9\xf1\x87\xc3\x3d\xce\x90\x36\xd7\xe8\xa0\xee\xf7\xd8\x69\x69\xad\x92\xb5\x64\x6a\x25\xa4\x56\x46\x0c\x17\xb4\x14\xb6\x5d\x19\x02\x82\xbd\xca\x70\x4f\x45\xd9\xa4\x45\x8f\x76\x3e\x2f\x19\x37\x2b\xbe\x33\x82\xcc\x5f\x2b\xb9\xe0\x7a\x15\xcf\xc2\x8b\x87\xad\x09\xc7\xdc\xf0\x40\x0e\xda\x36\xac\x5f\x28\x83\x43\xda\xcf\x3e\x12\xfa\xdb\x3e\x8f\xbf\x29\x81\x8f\x52\xb7\x46\xf5\x7f\x8a\xb9\xee\x58\x78\x90\x6b\x83\xd1\xcd\x5c\xdc\x86\x63\xda\x72\x2f\x21\x3e\xbe\x64\x1e\xbb\x53\xe5\x39\x15\xf6\x99\xe5\x2b\x34\xaf\xe2\x99\x5b\x30\x3f\x40\xbb\xfc\xfb\xae\xf9\xbe\xda\x87\xb0\x74\x90\x6c\xba\xc7\x91\x6b\x8d\x60\x04\xcf\xa1\xdd\x97\xe7\xdf\x1f\x61\xdc\xc1\x0c\x77\x5a\xb9\xe4\x81\x4d\xd7\x46\xc9\xc4\x2a\x77\x71\x89\xd6\x3f\xbc\xc5\x16\x1f\x2d\xd5\x48\xa1\xe4\x51\xa6\x18\xae\xb8\x6f\x9d\x3b\x4f\x91\x2a\xac\x49\x08\x32\x6e\x95\x7e\x57\x34\x27\x89\xea\x2b\x50\xf5\x1a\xdf\xda\x56\xea\x3e\xd3\xee\xa3\xb5\xe4\x5b\x64\xef\xe7\x54\xaa\xb2\x70\x0d\x7d\x55\xa9\x9c\xa3\x4d\xa1\x0a\x53\x67\x15\xaa\x3f\x7b\xd1\xaf\x58\x49\xae\x55\x0a\xf5\xc7\xb0\xa1\xaa\x72\xa0\x2e\xec\x7f\x42\xfb\x2d\xf7\xff\xcb\xb9\xff\x5a\x23\xb5\x38\xfa\xf2\x8c\xff\x36\x39\x5d\xd3\xe4\xff\x39\xb7\x33\x0f\x7d\x95\xdb\x6d\x87\x9b\x1c\x0f\xd1\x39\xaf\x19\xf1\xa2\x5f\x25\xc7\xab\xbb\xfa\x62\x32\xcd\x0b\xff\x5d\xe9\x72\x5c\xe7\xd6\x64\xaa\x91\xb2\xf5\x78\x51\x4a\xff\x65\x15\xc6\x13\xd8\x78\x35\xb3\x19\xdc\x70\x63\x51\xc2\x42\x69\xb0\x39\xba\x5d\x05\xb4\x7a\x30\x60\x15\xd0\xa2\x40\xaa\xbd\xe0\xe5\x78\x34\xf5\x9d\xf6\x68\x32\x75\x64\x1c\x8f\xde\xbc\xbb\x7d\x5f\xa6\x56\xa3\xab\x0e\x7c\xc1\x91\x8d\x5e\x40\xf3\x06\xac\x5f\x01\xc0\x17\x30\xc6\x69\x38\x27\x4d\xfd\x39\xe1\xed\xdd\xed\x4d\xfd\x55\x6e\x0e\xdf\x35\xa2\x41\xf8\x81\x4b\xa6\x1e\xa6\x42\x65\xfe\xcb\xeb\x34\xa7\x26\x87\x67\xcf\xe0\x72\x70\x66\x52\x69\x6a\x6b\x81\x83\xb2\x3e\x00\xe3\x91\x3b\x94\x8c\x26\xcd\x71\x6f\x7b\xd1\xbe\x6e\x27\xaf\x2e\x6a\x7c\xee\x72\x6e\xc0\xe4\xaa\x14\x0c\x52\x74\x3d\x97\x83\xc9\xaa\x02\x04\xde\xa3\x80\x1a\x64\x07\x98\x43\xc6\x5d\x9d\xc4\xa2\xb4\xa5\x46\x78\xf3\xee\x16\x50\xe0\xca\xd4\xfa\x6c\x4e\x2d\x50\x8d\x20\x95\x05\x2a\x7c\x64\xa0\xd0\x68\x9c\x0e\x25\x81\xf8\x11\x32\xad\x60\x6f\x62\xa8\x64\x30\x7b\x9a\x9a\xe0\xc5\x31\xbc\x5d\xba\x28\x8f\xbb\x46\xc7\x54\x76\xe7\xe1\x9f\xc0\x93\x04\x48\x29\xc3\xbf\xc0\x18\x69\x63\x36\x88\x7a\x02\x97\x7b\x3a\xa6\xd4\x5a\x3d\x1e\xb9\xa3\x62\x03\x61\x0f\xb8\xbe\xe1\xa1\x3e\x9e\x34\x3d\xe7\xc6\x2a\xbd\x9e\x16\xa5\xc9\xdf\x5b\x6a\x71\x4c\xc8\x8b\x1d\xc4\x53\x5f\x22\x5f\xec\x59\x5a\x50\x9b\xfb\xaf\x98\xcf\xf7\xa6\x42\xfb\x5b\x59\xb9\xf5\x57\xf7\x1b\xcf\xea\x3c\xd9\x6c\x50\xb2\xed\xf6\xe2\xdf\x01\x00\x00\xff\xff\x5e\xa7\x4b\x69\x17\x1c\x00\x00"), }, diff --git a/static/js/dashboard.js b/static/js/dashboard.js index f82a9c168..cfd2c7de7 100644 --- a/static/js/dashboard.js +++ b/static/js/dashboard.js @@ -276,13 +276,9 @@ dkron.controller('IndexCtrl', function ($scope, $http, $timeout, $element) { }; $scope.series = [{ - name: 'Success count', + name: 'Running', color: 'green', data: [{ x: 0, y: 0 }] - }, { - name: 'Error count', - color: 'red', - data: [{ x: 0, y: 0 }] }]; $scope.features = { hover: { @@ -353,6 +349,9 @@ dkron.controller('IndexCtrl', function ($scope, $http, $timeout, $element) { $scope.error_count = 0; $scope.failed_jobs = 0; $scope.successful_jobs = 0; + + $scope.running = 0; + $scope.jobs = []; $scope.updateGraph = function (data) { @@ -361,7 +360,7 @@ dkron.controller('IndexCtrl', function ($scope, $http, $timeout, $element) { var color = $scope.series[0].color; var success_count = 0; var error_count = 0; - var diff = 0; + var running = 0; $scope.jobs = data; $scope.failed_jobs = 0; @@ -376,13 +375,14 @@ dkron.controller('IndexCtrl', function ($scope, $http, $timeout, $element) { } else { $scope.failed_jobs = $scope.failed_jobs + 1; } - } - if ($scope.success_count != 0) { - diff = success_count - $scope.success_count; + + if (data[i].status == 'running') { + running = running + 1; + } } $scope.success_count = success_count; - gdata.push({ x: gdata[gdata.length - 1].x + 1, y: diff }) + gdata.push({ x: gdata[gdata.length - 1].x + 1, y: running }) $scope.series[0] = { name: name, @@ -390,22 +390,7 @@ dkron.controller('IndexCtrl', function ($scope, $http, $timeout, $element) { data: gdata }; - gdata = $scope.series[1].data; - name = $scope.series[1].name; - color = $scope.series[1].color; - - if ($scope.error_count != 0) { - diff = error_count - $scope.error_count; - } $scope.error_count = error_count; - - gdata.push({ x: gdata[gdata.length - 1].x + 1, y: diff }) - - $scope.series[1] = { - name: name, - color: color, - data: gdata - }; } updateView();