FAILED

-
-
+ +
-
+
()

-- cgit v1.2.3 From 782793d75212d9efc1f2d3d03e4c889c924142e8 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 1 Oct 2016 01:02:23 +0200 Subject: activesupport >= 5.0.0 requires ruby 2.2 which break jessie support --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 4406e52..439b890 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source 'https://rubygems.org' gem 'gitlab', :git => 'https://github.com/varac/gitlab.git', :branch => 'pipeline_support' +# activesupport >= 5.0.0 requires ruby 2.2 which break jessie support +gem 'activesupport', '< 5.0.0' gemspec -- cgit v1.2.3 From d38ffd2864575cecb193c9933e0c6a40cbbaf6c3 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 1 Oct 2016 01:06:45 +0200 Subject: update Gemfile.lock --- Gemfile.lock | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4aaeb58..3615536 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,17 +28,17 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (5.0.0.1) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (4.2.7.1) i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) backports (3.6.8) coffee-script (2.2.0) coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) crack (0.4.3) safe_yaml (~> 1.0.0) daemons (1.2.4) @@ -57,6 +57,7 @@ GEM httparty (0.14.0) multi_xml (>= 0.5.2) i18n (0.7.0) + json (1.8.3) metaclass (0.0.4) mime-types (3.1) mime-types-data (~> 3.2015) @@ -135,6 +136,7 @@ PLATFORMS ruby DEPENDENCIES + activesupport (< 5.0.0) dashing! fakeweb (~> 1.3.0) gitlab! -- cgit v1.2.3 From 009594945171ce5aab15d341f36fad80dce36377 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 1 Oct 2016 01:21:42 +0200 Subject: pin two other gems that fail to install otherwise --- .gitignore | 2 ++ Gemfile | 6 ++++++ Gemfile.lock | 12 ++++++------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 65268e8..bc62fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ history.yml .*.swp assets/images/piwik.png credentials +.bundle/ +vendor/ diff --git a/Gemfile b/Gemfile index 439b890..08e8f3f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,12 @@ source 'https://rubygems.org' gem 'gitlab', :git => 'https://github.com/varac/gitlab.git', :branch => 'pipeline_support' # activesupport >= 5.0.0 requires ruby 2.2 which break jessie support gem 'activesupport', '< 5.0.0' +# both following gems will break on jessie with +# Gem::InstallError: rest-client requires Ruby version >= 2.0.0. +# even when ruby 2.1 ist installed. So we pin earlier versions: +gem 'mime-types', '2.6.2' +gem 'rest-client', '< 2.0.0' + gemspec diff --git a/Gemfile.lock b/Gemfile.lock index 3615536..f541e3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,9 +59,7 @@ GEM i18n (0.7.0) json (1.8.3) metaclass (0.0.4) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types (2.6.2) mini_portile2 (2.1.0) minitest (5.2.3) mocha (0.14.0) @@ -87,10 +85,10 @@ GEM rack-test (0.6.3) rack (>= 1.0) rake (10.1.1) - rest-client (2.0.0) + rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) rufus-scheduler (2.0.24) tzinfo (>= 0.3.22) safe_yaml (1.0.4) @@ -141,9 +139,11 @@ DEPENDENCIES fakeweb (~> 1.3.0) gitlab! haml (~> 4.0.4) + mime-types (= 2.6.2) minitest (~> 5.2.0) mocha (~> 0.14.0) rake (~> 10.1.0) + rest-client (< 2.0.0) simplecov (~> 0.8.2) BUNDLED WITH -- cgit v1.2.3 From e7d8080b14a32788f120c1abde69ed0420d760b0 Mon Sep 17 00:00:00 2001 From: Varac Date: Mon, 17 Jul 2017 18:36:56 +0200 Subject: Add Nagios --- .gitignore | 1 + README.md | 2 +- dashboards/dashboard.erb | 3 ++ jobs/gitlab_build_status.rb | 5 +- jobs/nagios.rb | 123 +++++++++++++++++++++++++++----------------- 5 files changed, 84 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index bc62fd0..7ad5658 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ assets/images/piwik.png credentials .bundle/ vendor/ +nagiosharder.yml diff --git a/README.md b/README.md index 8717cfa..faa31e9 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ gem install bundler Install app dependencies using bundler: ``` -bundle install --path=vendor/bundle +bundle install --path=vendor/bundle --deployment ``` If `bundle install` fails along the way, you're probably missing Xcode command line utilities: `xcode-select --install` diff --git a/dashboards/dashboard.erb b/dashboards/dashboard.erb index babc0f2..1c97924 100644 --- a/dashboards/dashboard.erb +++ b/dashboards/dashboard.erb @@ -12,6 +12,9 @@

diff --git a/jobs/gitlab_build_status.rb b/jobs/gitlab_build_status.rb index addfaed..be52f98 100644 --- a/jobs/gitlab_build_status.rb +++ b/jobs/gitlab_build_status.rb @@ -1,6 +1,5 @@ require 'gitlab' require 'date' -require 'pp' Gitlab.configure do |config| # API endpoint URL, default @@ -10,7 +9,7 @@ Gitlab.configure do |config| config.private_token = ENV['GITLAB_TOKEN'] end -SCHEDULER.every '300s', :first_in => 0 do +SCHEDULER.every '3000s', :first_in => 0 do broken_builds = [] # get a list of all projects @@ -35,7 +34,7 @@ SCHEDULER.every '300s', :first_in => 0 do unless proj[:status] =~ /^success|running|No builds configured$/ broken_builds << proj end - puts proj + #puts proj end failed = broken_builds.size > 0 diff --git a/jobs/nagios.rb b/jobs/nagios.rb index bda1b59..56c6f88 100644 --- a/jobs/nagios.rb +++ b/jobs/nagios.rb @@ -8,88 +8,119 @@ SCHEDULER.every '10s' do query_url: 'https://unstable.bitmask.net/cgi-bin/nagios3/', home_url: 'https://unstable.bitmask.net/nagios3/', username: 'nagiosadmin', - password: ENV['UNSTABLE_PASS'] + password: ENV['NAGIOS_UNSTABLE_PASS'] }, demo: { domain: 'demo.bitmask.i', query_url: 'https://unstable.bitmask.net/cgi-bin/nagios3/', home_url: 'https://unstable.bitmask.net/nagios3/', username: 'nagiosadmin', - password: ENV['UNSTABLE_PASS'] + password: ENV['NAGIOS_UNSTABLE_PASS'] }, dev: { domain: 'dev.bitmask.i', query_url: 'https://unstable.bitmask.net/cgi-bin/nagios3/', home_url: 'https://unstable.bitmask.net/nagios3/', username: 'nagiosadmin', - password: ENV['UNSTABLE_PASS'] + password: ENV['NAGIOS_UNSTABLE_PASS'] }, mail: { domain: 'mail.bitmask.i', query_url: 'https://unstable.bitmask.net/cgi-bin/nagios3/', home_url: 'https://unstable.bitmask.net/nagios3/', username: 'nagiosadmin', - password: ENV['UNSTABLE_PASS'] + password: ENV['NAGIOS_UNSTABLE_PASS'] }, unstable: { domain: 'unstable.bitmask.i', query_url: 'https://unstable.bitmask.net/cgi-bin/nagios3/', home_url: 'https://unstable.bitmask.net/nagios3/', username: 'nagiosadmin', - password: ENV['UNSTABLE_PASS'] + password: ENV['NAGIOS_UNSTABLE_PASS'] + }, + leap: { + domain: 'leap.se', + query_url: 'https://hare.leap.se/cgi-bin/nagios3/', + home_url: 'https://hare.leap.se/nagios3/', + username: 'nagiosadmin', + password: ENV['NAGIOS_LEAP_PASS'] }, } - environments.each do |key, env| - nag = NagiosHarder::Site.new(env[:query_url], env[:username], env[:password],'3','iso8601') - unacked = nag.service_status( - :host_status_types => [:all], - :service_status_types => [:warning, :critical, :unknown], - :service_props => [:no_scheduled_downtime, :state_unacknowledged] - ) - critical_count = 0 - critical_services = Array.new - warning_count = 0 - warning_services = Array.new - unknown_count = 0 - unknown_services = Array.new - unacked.each do |alert| - next if ! alert["host"].include? env[:domain] - next if ! tried_at_maximum(alert["attempts"]) + environments = { + leap: { + domain: 'leap.se', + query_url: 'https://hare.leap.se/cgi-bin/nagios3/', + home_url: 'https://hare.leap.se/nagios3/', + username: 'nagiosadmin', + password: ENV['NAGIOS_LEAP_PASS'] + } + } + - if alert["status"].eql? "CRITICAL" - critical_count += 1 - critical_services << alert["service"] - elsif alert["status"].eql? "WARNING" - warning_count += 1 - warning_services << alert["service"] - elsif alert["status"].eql? "UNKNOWN" - unknown_count += 1 - unknown_services << alert["service"] + environments.each do |key, env| + begin + nag = NagiosHarder::Site.new(env[:query_url], env[:username], env[:password],'3','iso8601') + #puts nag + unacked = nag.service_status( + :host_status_types => [:all], + :service_status_types => [:warning, :critical, :unknown], + :service_props => [:no_scheduled_downtime, :state_unacknowledged] + ) + #puts unacked + critical_count = 0 + critical_services = Array.new + warning_count = 0 + warning_services = Array.new + unknown_count = 0 + unknown_services = Array.new + + unacked.each do |alert| + puts alert + next if ! alert["host"].include? env[:domain] + next if ! tried_at_maximum(alert["attempts"]) + puts '=============' + if alert["status"].eql? "CRITICAL" + critical_count += 1 + critical_services << alert["service"] + elsif alert["status"].eql? "WARNING" + warning_count += 1 + warning_services << alert["service"] + elsif alert["status"].eql? "UNKNOWN" + unknown_count += 1 + unknown_services << alert["service"] + end end - end - if ['cdev.bitmask.i', 'dev.bitmask.i', 'unstable.bitmask.i'].include? env[:domain] - status = critical_count + warning_count + unknown_count > 0 ? "gray" : "green" - else - status = critical_count > 0 ? "red" : (warning_count + unknown_count > 0 ? "yellow" : "green") - end + if ['cdev.bitmask.i', 'dev.bitmask.i', 'unstable.bitmask.i'].include? env[:domain] + status = critical_count + warning_count + unknown_count > 0 ? "gray" : "green" + else + status = critical_count > 0 ? "red" : (warning_count + unknown_count > 0 ? "yellow" : "green") + end - # nagiosharder may not alert us to a problem querying nagios. - # If no problems found check that we fetch service status and - # expect to find more than 0 entries. - if critical_count == 0 and warning_count == 0 and unknown_count == 0 - if nag.service_status.length == 0 - status = "error" + # nagiosharder may not alert us to a problem querying nagios. + # If no problems found check that we fetch service status and + # expect to find more than 0 entries. + if critical_count == 0 and warning_count == 0 and unknown_count == 0 + if nag.service_status.length == 0 + status = "error" + end end - end - #puts key.to_s + ": " + critical_count.to_s - #puts critical_services.join(", ") - #puts + puts key.to_s + ": " + critical_count.to_s + puts critical_services.join(", ") + puts + + rescue => error + error.backtrace + puts 'Could not query nagios at '+env[:query_url] + status = "red" + critical_count = 1 + critical_services = ['Could not query nagios'] + end send_event('nagios-' + key.to_s, { criticals: critical_count, critical_services: critical_services, warnings: warning_count, warning_services: warning_services, -- cgit v1.2.3 From 4db50705a9bf22701ae43011d4b9485dadcaad8b Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 17 Jul 2017 19:05:54 +0200 Subject: minor: run for all environments rolling back a debug restriction to leap environment --- jobs/nagios.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/jobs/nagios.rb b/jobs/nagios.rb index 56c6f88..687ac32 100644 --- a/jobs/nagios.rb +++ b/jobs/nagios.rb @@ -49,17 +49,6 @@ SCHEDULER.every '10s' do - environments = { - leap: { - domain: 'leap.se', - query_url: 'https://hare.leap.se/cgi-bin/nagios3/', - home_url: 'https://hare.leap.se/nagios3/', - username: 'nagiosadmin', - password: ENV['NAGIOS_LEAP_PASS'] - } - } - - environments.each do |key, env| begin nag = NagiosHarder::Site.new(env[:query_url], env[:username], env[:password],'3','iso8601') -- cgit v1.2.3 From d8e6b9f73339b5e73f77a418c1ba1a3206393e73 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 17 Jul 2017 19:06:53 +0200 Subject: cleanup: jenkins - we don't use anymore --- dashboards/dashboard.erb | 16 ++--- jobs/jenkins_build_status.rb | 73 ---------------------- .../jenkins_build_status.coffee | 28 --------- .../jenkins_build_status/jenkins_build_status.html | 16 ----- .../jenkins_build_status/jenkins_build_status.scss | 56 ----------------- 5 files changed, 6 insertions(+), 183 deletions(-) delete mode 100644 jobs/jenkins_build_status.rb delete mode 100644 widgets/jenkins_build_status/jenkins_build_status.coffee delete mode 100644 widgets/jenkins_build_status/jenkins_build_status.html delete mode 100644 widgets/jenkins_build_status/jenkins_build_status.scss diff --git a/dashboards/dashboard.erb b/dashboards/dashboard.erb index 1c97924..5c86d7f 100644 --- a/dashboards/dashboard.erb +++ b/dashboards/dashboard.erb @@ -2,28 +2,24 @@

- -

diff --git a/jobs/jenkins_build_status.rb b/jobs/jenkins_build_status.rb deleted file mode 100644 index 267b8da..0000000 --- a/jobs/jenkins_build_status.rb +++ /dev/null @@ -1,73 +0,0 @@ -require 'net/http' -require 'json' - -JENKINS_URI = "https://jenkins.leap.se/" - -JENKINS_AUTH = { - 'name' => 'nobody', - 'password' => 'nopw' -} - -SCHEDULER.every '10s' do - - json = getFromJenkins(JENKINS_URI + 'api/json?pretty=true') - - failedJobs = Array.new - puts failedJobs - succeededJobs = Array.new - array = json['jobs'] - array.each { - |job| - - next if job['color'] == 'disabled' - next if job['color'] == 'notbuilt' - next if job['color'] == 'blue' - next if job['color'] == 'blue_anime' - - jobStatus = ''; - if job['color'] == 'yellow' || job['color'] == 'yellow_anime' - jobStatus = getFromJenkins(job['url'] + 'lastUnstableBuild/api/json') - elsif job['color'] == 'aborted' || job['color'] == 'aborted_anime' - jobStatus = getFromJenkins(job['url'] + 'lastUnsuccessfulBuild/api/json') - else - jobStatus = getFromJenkins(job['url'] + 'lastFailedBuild/api/json') - end - - culprits = jobStatus['culprits'] - - culpritName = getNameFromCulprits(culprits) - if culpritName != '' - culpritName = culpritName.partition('<').first - end - - failedJobs.push({ label: job['name'], value: culpritName}) - } - - failed = failedJobs.size > 0 - - send_event('jenkinsBuildStatus', { failedJobs: failedJobs, succeededJobs: succeededJobs, failed: failed }) -end - -def getFromJenkins(path) - - uri = URI.parse(path) - - http = Net::HTTP.new(uri.host, uri.port) - http.use_ssl = true - request = Net::HTTP::Get.new(uri.request_uri) - ##if JENKINS_AUTH['name'] - # request.basic_auth(JENKINS_AUTH['name'], JENKINS_AUTH['password']) - #end - response = http.request(request) - - json = JSON.parse(response.body) - return json -end - -def getNameFromCulprits(culprits) - culprits.each { - |culprit| - return culprit['fullName'] - } - return '' -end diff --git a/widgets/jenkins_build_status/jenkins_build_status.coffee b/widgets/jenkins_build_status/jenkins_build_status.coffee deleted file mode 100644 index d7d8630..0000000 --- a/widgets/jenkins_build_status/jenkins_build_status.coffee +++ /dev/null @@ -1,28 +0,0 @@ -class Dashing.JenkinsBuildStatus extends Dashing.Widget - - lastPlayed: 0 - timeBetweenSounds: 300000 - - onData: (data) -> - if data.failed - $(@node).find('div.build-failed').show() - $(@node).find('div.build-succeeded').hide() - $(@node).css("background-color", "red") - - if 'speechSynthesis' of window - @playSoundForUser data.failedJobs[0].value if Date.now() - @lastPlayed > @timeBetweenSounds - else - $(@node).find('div.build-failed').hide() - $(@node).find('div.build-succeeded').show() - $(@node).css("background-color", "#12b0c5") - - playSoundForUser: (user) -> - @lastPlayed = Date.now() - texts = ["#{user} has broken the build.", "The build is broken by #{user}", "#{user} is great, but lacks some programming skills", "Oops, I did it again."] - textNr = Math.floor((Math.random() * texts.length)); - @playSound texts[textNr] - - playSound: (text) -> - msg = new SpeechSynthesisUtterance(text) - msg.voice = speechSynthesis.getVoices()[0] - speechSynthesis.speak msg \ No newline at end of file diff --git a/widgets/jenkins_build_status/jenkins_build_status.html b/widgets/jenkins_build_status/jenkins_build_status.html deleted file mode 100644 index 472bc73..0000000 --- a/widgets/jenkins_build_status/jenkins_build_status.html +++ /dev/null @@ -1,16 +0,0 @@ -

FAILED

-
-
-

- -

All builds are successful

- -

diff --git a/widgets/jenkins_build_status/jenkins_build_status.scss b/widgets/jenkins_build_status/jenkins_build_status.scss deleted file mode 100644 index 2e475b0..0000000 --- a/widgets/jenkins_build_status/jenkins_build_status.scss +++ /dev/null @@ -1,56 +0,0 @@ -// ---------------------------------------------------------------------------- -// Sass declarations -// ---------------------------------------------------------------------------- -$background-color: #ec663c; -$title-color: rgba(255, 255, 255, 0.7); -$label-color: rgba(255, 255, 255, 0.7); -$value-color: #fff; - -// ---------------------------------------------------------------------------- -// Widget-text styles -// ---------------------------------------------------------------------------- -.widget-jenkins-build-status { - - background-color: $background-color; - - .title { - color: $title-color; - } - .updated-at { - color: rgba(255, 255, 255, 0.7); - } - - ol, ul { - margin: 0 15px; - text-align: left; - color: $label-color; - } - - li { - margin-bottom: 5px; - font-size: 20px; - } - - .label { - color: $label-color; - } - - .value { - margin-left: 12px; - font-weight: 600; - color: $value-color; - } - - .updated-at { - color: rgba(0, 0, 0, 0.3); - } - - .build-failed { - display: none; - } - - .fa { - font-size: 10em; - color: $label-color; - } -} -- cgit v1.2.3 From 90be5e3859fbdd02202720716894b6b5261ab0e3 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 17 Jul 2017 20:51:46 +0200 Subject: feat: only alert for failing master builds --- Gemfile | 3 +-- Gemfile.lock | 16 +++++----------- jobs/gitlab_build_status.rb | 18 ++++++++++-------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index 08e8f3f..a1601d1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'gitlab', :git => 'https://github.com/varac/gitlab.git', :branch => 'pipeline_support' +gem 'gitlab' # activesupport >= 5.0.0 requires ruby 2.2 which break jessie support gem 'activesupport', '< 5.0.0' # both following gems will break on jessie with @@ -8,7 +8,6 @@ gem 'activesupport', '< 5.0.0' gem 'mime-types', '2.6.2' gem 'rest-client', '< 2.0.0' - gemspec gem "nagiosharder" diff --git a/Gemfile.lock b/Gemfile.lock index f541e3d..9629ed0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/varac/gitlab.git - revision: a2d105128aab0226082bbdabf7da0e24892e5b79 - branch: pipeline_support - specs: - gitlab (3.7.0) - httparty - terminal-table - PATH remote: . specs: @@ -48,6 +39,9 @@ GEM eventmachine (1.2.0.1) execjs (2.0.2) fakeweb (1.3.0) + gitlab (4.2.0) + httparty + terminal-table haml (4.0.7) tilt hashie (1.2.0) @@ -137,7 +131,7 @@ DEPENDENCIES activesupport (< 5.0.0) dashing! fakeweb (~> 1.3.0) - gitlab! + gitlab haml (~> 4.0.4) mime-types (= 2.6.2) minitest (~> 5.2.0) @@ -147,4 +141,4 @@ DEPENDENCIES simplecov (~> 0.8.2) BUNDLED WITH - 1.11.2 + 1.14.6 diff --git a/jobs/gitlab_build_status.rb b/jobs/gitlab_build_status.rb index be52f98..317118d 100644 --- a/jobs/gitlab_build_status.rb +++ b/jobs/gitlab_build_status.rb @@ -14,18 +14,20 @@ SCHEDULER.every '3000s', :first_in => 0 do # get a list of all projects projects = Gitlab.group(ENV['GITLAB_GROUP_ID']).projects.map do |proj| - { :id => proj['id'], :name => proj['name'], :path => proj['path_with_namespace'] } + { :id => proj['id'], :name => proj['name'], :path => proj['path_with_namespace'], + :default_branch => proj['default_branch']} end projects.each do |proj| - begin - pipeline = Gitlab.pipelines(proj[:id], { per_page: 1 }) + pipelines = Gitlab.pipelines(proj[:id], { per_page: 10 }) #pp pipeline[0] - proj[:status] = pipeline[0].status - proj[:pipeline_id] = pipeline[0].id - proj[:ref] = pipeline[0].ref - date = DateTime.parse(pipeline[0].updated_at).strftime("%F %T") + pipeline = pipelines.find{|p| p.ref == proj[:default_branch]} + next if pipeline.nil? + proj[:status] = pipeline.status + proj[:pipeline_id] = pipeline.id + proj[:ref] = pipeline.ref + date = DateTime.parse(pipeline.updated_at).strftime("%F %T") proj[:date] = date rescue proj[:status] = 'No builds configured' @@ -34,7 +36,7 @@ SCHEDULER.every '3000s', :first_in => 0 do unless proj[:status] =~ /^success|running|No builds configured$/ broken_builds << proj end - #puts proj + puts proj end failed = broken_builds.size > 0 -- cgit v1.2.3 From 067b5a37801e8a5b6822060ff10200e5aae428eb Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 18 Jul 2017 09:18:08 +0200 Subject: nagios: better error reporting, less noise --- jobs/nagios.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/jobs/nagios.rb b/jobs/nagios.rb index 687ac32..34a5487 100644 --- a/jobs/nagios.rb +++ b/jobs/nagios.rb @@ -67,10 +67,8 @@ SCHEDULER.every '10s' do unknown_services = Array.new unacked.each do |alert| - puts alert next if ! alert["host"].include? env[:domain] next if ! tried_at_maximum(alert["attempts"]) - puts '=============' if alert["status"].eql? "CRITICAL" critical_count += 1 critical_services << alert["service"] @@ -98,16 +96,14 @@ SCHEDULER.every '10s' do end end - puts key.to_s + ": " + critical_count.to_s - puts critical_services.join(", ") - puts + puts "#{key}: #{critical_count} (#{critical_services.join(', ')})" rescue => error - error.backtrace puts 'Could not query nagios at '+env[:query_url] + puts error status = "red" critical_count = 1 - critical_services = ['Could not query nagios'] + critical_services = ["Could not query nagios #{error}"] end send_event('nagios-' + key.to_s, { -- cgit v1.2.3 From 60cecf2f1815dfa51ea64091cc3afcda47438623 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 18 Jul 2017 09:21:59 +0200 Subject: nagios: only check every minute --- jobs/nagios.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/nagios.rb b/jobs/nagios.rb index 34a5487..1ea1444 100644 --- a/jobs/nagios.rb +++ b/jobs/nagios.rb @@ -1,4 +1,4 @@ -SCHEDULER.every '10s' do +SCHEDULER.every '60s' do require 'bundler/setup' require 'nagiosharder' -- cgit v1.2.3 From b207ea5f24cb52d5818d04d2b0c872cc8598628e Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 18 Jul 2017 12:57:44 +0200 Subject: refactor: GitlabStats to collect stats from gitlab Want to add stats about merge requests in the future while still fetching each project once. --- jobs/gitlab_build_status.rb | 34 ++++------------------------------ lib/gitlab_stats.rb | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 30 deletions(-) create mode 100644 lib/gitlab_stats.rb diff --git a/jobs/gitlab_build_status.rb b/jobs/gitlab_build_status.rb index 317118d..7febcae 100644 --- a/jobs/gitlab_build_status.rb +++ b/jobs/gitlab_build_status.rb @@ -1,39 +1,13 @@ -require 'gitlab' -require 'date' +require 'gitlab_stats' -Gitlab.configure do |config| - # API endpoint URL, default - config.endpoint = ENV['GITLAB_ENDPOINT'] - - # User's private token or OAuth2 access token - config.private_token = ENV['GITLAB_TOKEN'] -end SCHEDULER.every '3000s', :first_in => 0 do broken_builds = [] - # get a list of all projects - projects = Gitlab.group(ENV['GITLAB_GROUP_ID']).projects.map do |proj| - { :id => proj['id'], :name => proj['name'], :path => proj['path_with_namespace'], - :default_branch => proj['default_branch']} - end - - projects.each do |proj| - begin - pipelines = Gitlab.pipelines(proj[:id], { per_page: 10 }) - #pp pipeline[0] - pipeline = pipelines.find{|p| p.ref == proj[:default_branch]} - next if pipeline.nil? - proj[:status] = pipeline.status - proj[:pipeline_id] = pipeline.id - proj[:ref] = pipeline.ref - date = DateTime.parse(pipeline.updated_at).strftime("%F %T") - proj[:date] = date - rescue - proj[:status] = 'No builds configured' - end + GitlabStats.projects.each do |proj| + GitlabStats.add_pipeline_stats_to proj - unless proj[:status] =~ /^success|running|No builds configured$/ + unless proj[:status] =~ /^success|running|No builds configured/ broken_builds << proj end puts proj diff --git a/lib/gitlab_stats.rb b/lib/gitlab_stats.rb new file mode 100644 index 0000000..5b41263 --- /dev/null +++ b/lib/gitlab_stats.rb @@ -0,0 +1,42 @@ +require 'gitlab' +require 'date' + +Gitlab.configure do |config| + # API endpoint URL, default + config.endpoint = ENV['GITLAB_ENDPOINT'] + + # User's private token or OAuth2 access token + config.private_token = ENV['GITLAB_TOKEN'] +end + +module GitlabStats + # get a list of all projects + def self.projects + Gitlab.group(ENV['GITLAB_GROUP_ID']).projects.map do |proj| + { :id => proj['id'], :name => proj['name'], :path => proj['path_with_namespace'], + :default_branch => proj['default_branch']} + end + end + + def self.add_pipeline_stats_to(proj) + pipelines = Gitlab.pipelines(proj[:id], { per_page: 10 }) + #pp pipeline[0] + pipeline = pipelines.find{|p| p.ref == proj[:default_branch]} + if pipeline.nil? + if pipelines.any? + proj[:status] = 'No builds run for default branch lately' + else + proj[:status] = 'No builds configured' + end + return + end + proj[:status] = pipeline.status + proj[:pipeline_id] = pipeline.id + proj[:ref] = pipeline.ref + date = DateTime.parse(pipeline.updated_at).strftime("%F %T") + proj[:date] = date + rescue e + proj[:status] = "Error: #{e}" + end + +end -- cgit v1.2.3 From bf3d53d415bdc8daef7313c8db0916056abff5f4 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 18 Jul 2017 13:55:06 +0200 Subject: minor: increase frequency of gitlab runs also print the duration of going through all projects. --- jobs/gitlab_build_status.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jobs/gitlab_build_status.rb b/jobs/gitlab_build_status.rb index 7febcae..f2f669a 100644 --- a/jobs/gitlab_build_status.rb +++ b/jobs/gitlab_build_status.rb @@ -1,8 +1,9 @@ require 'gitlab_stats' -SCHEDULER.every '3000s', :first_in => 0 do +SCHEDULER.every '300s', :first_in => 0 do broken_builds = [] + started = Time.now GitlabStats.projects.each do |proj| GitlabStats.add_pipeline_stats_to proj @@ -16,4 +17,5 @@ SCHEDULER.every '3000s', :first_in => 0 do failed = broken_builds.size > 0 send_event('gitlab-builds', { failed: failed, header: "Gitlab builds", broken_builds: broken_builds }) + puts "Going through all projects took: #{started - Time.now}." end -- cgit v1.2.3 From fc531b2895eb57d675c0037cc5d3381ff664f5d4 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 18 Jul 2017 14:13:16 +0200 Subject: feat: only check builds where enabled and not archived also reduced time between checks to 2 minutes and looking at last 50 builds. --- jobs/gitlab_build_status.rb | 8 +++++--- lib/gitlab_stats.rb | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/jobs/gitlab_build_status.rb b/jobs/gitlab_build_status.rb index f2f669a..fdfe8a8 100644 --- a/jobs/gitlab_build_status.rb +++ b/jobs/gitlab_build_status.rb @@ -1,21 +1,23 @@ require 'gitlab_stats' -SCHEDULER.every '300s', :first_in => 0 do +SCHEDULER.every '120s', :first_in => 0 do broken_builds = [] started = Time.now GitlabStats.projects.each do |proj| + next if proj[:archived] + next unless proj[:builds_enabled] GitlabStats.add_pipeline_stats_to proj + puts "#{proj[:name]} (#{proj[:ref]}): #{proj[:status]}" unless proj[:status] =~ /^success|running|No builds configured/ broken_builds << proj end - puts proj end failed = broken_builds.size > 0 send_event('gitlab-builds', { failed: failed, header: "Gitlab builds", broken_builds: broken_builds }) - puts "Going through all projects took: #{started - Time.now}." + puts "Going through all projects took: #{Time.now - started}." end diff --git a/lib/gitlab_stats.rb b/lib/gitlab_stats.rb index 5b41263..20b040a 100644 --- a/lib/gitlab_stats.rb +++ b/lib/gitlab_stats.rb @@ -13,13 +13,17 @@ module GitlabStats # get a list of all projects def self.projects Gitlab.group(ENV['GITLAB_GROUP_ID']).projects.map do |proj| - { :id => proj['id'], :name => proj['name'], :path => proj['path_with_namespace'], + { :id => proj['id'], + :name => proj['name'], + :path => proj['path_with_namespace'], + :archived => proj['archived'], + :builds_enabled => proj['builds_enabled'], :default_branch => proj['default_branch']} end end def self.add_pipeline_stats_to(proj) - pipelines = Gitlab.pipelines(proj[:id], { per_page: 10 }) + pipelines = Gitlab.pipelines(proj[:id], { per_page: 50 }) #pp pipeline[0] pipeline = pipelines.find{|p| p.ref == proj[:default_branch]} if pipeline.nil? -- cgit v1.2.3 From 053edccaa06a27bd6e93e8c6aeaee8ef718c8ad4 Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 18 Jul 2017 19:54:59 +0200 Subject: gitlab: prefix log with timestamp and gitlab --- jobs/gitlab_build_status.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/gitlab_build_status.rb b/jobs/gitlab_build_status.rb index fdfe8a8..57fe0b0 100644 --- a/jobs/gitlab_build_status.rb +++ b/jobs/gitlab_build_status.rb @@ -10,7 +10,7 @@ SCHEDULER.every '120s', :first_in => 0 do next unless proj[:builds_enabled] GitlabStats.add_pipeline_stats_to proj - puts "#{proj[:name]} (#{proj[:ref]}): #{proj[:status]}" + puts "#{Time.now} gitlab: #{proj[:name]} (#{proj[:ref]}): #{proj[:status]}" unless proj[:status] =~ /^success|running|No builds configured/ broken_builds << proj end @@ -19,5 +19,5 @@ SCHEDULER.every '120s', :first_in => 0 do failed = broken_builds.size > 0 send_event('gitlab-builds', { failed: failed, header: "Gitlab builds", broken_builds: broken_builds }) - puts "Going through all projects took: #{Time.now - started}." + puts "#{Time.now} gitlab: Going through all projects took: #{Time.now - started}." end -- cgit v1.2.3 From 929138d1a99bac1ef12eea10425fbeb291535c2b Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 18 Jul 2017 20:20:03 +0200 Subject: style: highlight failing projects rather than timestamp --- dashboards/dashboard.erb | 4 ++-- widgets/gitlab_build_status/gitlab_build_status.html | 2 +- widgets/gitlab_build_status/gitlab_build_status.scss | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dashboards/dashboard.erb b/dashboards/dashboard.erb index 5c86d7f..50b81c6 100644 --- a/dashboards/dashboard.erb +++ b/dashboards/dashboard.erb @@ -1,5 +1,5 @@ -

diff --git a/widgets/gitlab_build_status/gitlab_build_status.html b/widgets/gitlab_build_status/gitlab_build_status.html index 00d799b..ebac828 100644 --- a/widgets/gitlab_build_status/gitlab_build_status.html +++ b/widgets/gitlab_build_status/gitlab_build_status.html @@ -4,7 +4,7 @@

()

( )

All Gitlab builds are successful

RUNNING

+ +
-
+
( )
+

Date: Wed, 19 Jul 2017 11:38:09 +0200 Subject: initial gitlab ci --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f68ed76 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +language: ruby +rvm: + - 2.3.0 + - 2.2.4 + - 2.1.8 + +script: "rake test" -- cgit v1.2.3 From bd5a828018b97363e694c18ed4f15b6df8ecf187 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 19 Jul 2017 11:43:39 +0200 Subject: ci: get tests to run on gitlab --- .gitlab-ci.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f68ed76..1043af1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,4 @@ -language: ruby -rvm: - - 2.3.0 - - 2.2.4 - - 2.1.8 +image: 0xacab.org:4567/leap/docker/ruby:latest -script: "rake test" +test: + script: "rake test" -- cgit v1.2.3 From ca7951262b984f128ac6a663d0c39f4e00e4f9d0 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 19 Jul 2017 11:59:46 +0200 Subject: ci: add deploy stage --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1043af1..5907ab5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,31 @@ image: 0xacab.org:4567/leap/docker/ruby:latest test: + stage: test script: "rake test" + +deploy: + stage: deploy + environment: + name: production + script: + - ssh dashboard@hare.leap.se "cd dashboard ; git pull" + - ssh dashboard@hare.leap.se "cd dashboard ; source credentials && bin/dashing stop ; bin/dashing start" + before_script: + # https://docs.gitlab.com/ce/ci/ssh_keys/README.html + # Install ssh-agent if not already installed, it is required by Docker. + # (change apt-get to yum if you use a CentOS-based image) + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + + # Run ssh-agent (inside the build environment) + - eval $(ssh-agent -s) + + # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store + - ssh-add <(echo "$SSH_PRIVATE_KEY") + + # For Docker builds disable host key checking. Be aware that by adding that + # you are suspectible to man-in-the-middle attacks. + # WARNING: Use this only with the Docker executor, if you use it with shell + # you will overwrite your user's SSH config. + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' -- cgit v1.2.3 From c61771fad424a2642a67300f7c5d69cc2cfb5611 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 19 Jul 2017 12:03:12 +0200 Subject: ci: bundle gems for running tests --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5907ab5..e329f88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,9 @@ image: 0xacab.org:4567/leap/docker/ruby:latest test: stage: test - script: "rake test" + script: "bundle exec rake test" + before_script: + - bundle deploy: stage: deploy -- cgit v1.2.3 From 758b0de80525957059e579b5391c367c82be9da8 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 19 Jul 2017 12:06:13 +0200 Subject: ci: cache gems between builds --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e329f88..ccbc2c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,11 @@ image: 0xacab.org:4567/leap/docker/ruby:latest +# Cache gems in between builds +cache: + key: shared + paths: + - vendor/ruby + test: stage: test script: "bundle exec rake test" -- cgit v1.2.3 From b80d7af9fe536a0f401b1b33c321654c12f7a57c Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 19 Jul 2017 12:09:46 +0200 Subject: ci: add javascript runtime --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccbc2c6..fa28ee7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,9 @@ test: stage: test script: "bundle exec rake test" before_script: + - sudo apt update && sudo apt install nodejs - bundle + allow_failure: true deploy: stage: deploy -- cgit v1.2.3 From d1238e27e1f7cd846fc698b59b5ad042c3c2217b Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 19 Jul 2017 17:22:17 +0200 Subject: Remove broken test stage --- .gitlab-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa28ee7..ab245e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,13 +6,14 @@ cache: paths: - vendor/ruby -test: - stage: test - script: "bundle exec rake test" - before_script: - - sudo apt update && sudo apt install nodejs - - bundle - allow_failure: true +#test: +# stage: test +# script: "bundle exec rake test" +# before_script: +# - sudo apt update && sudo apt install nodejs +# - bundle +# allow_failure: true + deploy: stage: deploy -- cgit v1.2.3 From a903156109a4b93ddb3bcd6fb1401f92f88056eb Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 19 Jul 2017 18:10:53 +0200 Subject: Use proper systemd user service for dashboard --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab245e1..37a6059 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,7 @@ deploy: environment: name: production script: - - ssh dashboard@hare.leap.se "cd dashboard ; git pull" - - ssh dashboard@hare.leap.se "cd dashboard ; source credentials && bin/dashing stop ; bin/dashing start" + - ssh dashboard@hare.leap.se "cd ~/dashboard ; git pull; systemctl --user restart dashboard.service" before_script: # https://docs.gitlab.com/ce/ci/ssh_keys/README.html # Install ssh-agent if not already installed, it is required by Docker. -- cgit v1.2.3 From d88c47105d804a9166fb865ea6fedf589d054b3c Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 19 Jul 2017 18:42:27 +0200 Subject: Set XDG_RUNTIME_DIR properly Otherwise systemctl will complain with: Failed to get D-Bus connection: Connection refused --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37a6059..9fae8a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,8 +19,6 @@ deploy: stage: deploy environment: name: production - script: - - ssh dashboard@hare.leap.se "cd ~/dashboard ; git pull; systemctl --user restart dashboard.service" before_script: # https://docs.gitlab.com/ce/ci/ssh_keys/README.html # Install ssh-agent if not already installed, it is required by Docker. @@ -39,3 +37,5 @@ deploy: # you will overwrite your user's SSH config. - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + script: + - ssh dashboard@hare.leap.se "export XDG_RUNTIME_DIR=/run/user/$UID; cd ~/dashboard ; git pull; systemctl --user restart dashboard.service" -- cgit v1.2.3 From a5dba836fc567f6943d9f3032706e92ad59de209 Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 19 Jul 2017 18:44:17 +0200 Subject: Dont expand variable locally --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fae8a8..f3e5183 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,4 +38,4 @@ deploy: - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' script: - - ssh dashboard@hare.leap.se "export XDG_RUNTIME_DIR=/run/user/$UID; cd ~/dashboard ; git pull; systemctl --user restart dashboard.service" + - ssh dashboard@hare.leap.se 'export XDG_RUNTIME_DIR=/run/user/$UID; cd ~/dashboard ; git pull; systemctl --user restart dashboard.service' -- cgit v1.2.3 From 5f1f1c0edfa877f18cb28682be087b4ac24e033f Mon Sep 17 00:00:00 2001 From: Varac Date: Mon, 11 Sep 2017 12:41:09 +0200 Subject: Code blocks show up nices in editor --- README.md | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index faa31e9..e157049 100644 --- a/README.md +++ b/README.md @@ -6,36 +6,29 @@ Check out http://shopify.github.com/dashing for more information. Install bundler if required -``` -gem install bundler -``` + gem install bundler Install app dependencies using bundler: -``` -bundle install --path=vendor/bundle --deployment -``` + bundle install --path=vendor/bundle --deployment If `bundle install` fails along the way, you're probably missing Xcode command line utilities: `xcode-select --install` If you're getting `fatal error: 'openssl/ssl.h' file not found` installing `eventmachine` dependency, you can try install it using the following command (make sure you have openssl installed): -```bash -gem install eventmachine -v '1.0.7' -- --with-cppflags='-I/usr/local/opt/openssl/include' -``` + + gem install eventmachine -v '1.0.7' -- --with-cppflags='-I/usr/local/opt/openssl/include' To gather the data, the dashboard needs access to your GoCI account & a GitHub token. You can store them and make them available to the app like so: -```bash -cp credentials_example credentials -source credentials -``` + + cp credentials_example credentials + source credentials For this dashboard you furthermore need nodejs installed, e.g. -```bash -nodenv local 0.10.36 -``` + + nodenv local 0.10.36 Use dashing to build the dashboard or start it locally. -``` -dashing start -``` + + dashing start + See `dashing --help` for usage. -- cgit v1.2.3 From 4433b0815b89797c870d6f74186b45bdc360c25a Mon Sep 17 00:00:00 2001 From: Varac Date: Mon, 11 Sep 2017 12:53:14 +0200 Subject: Fix matching of domains so cdev issues wont show up under dev --- jobs/nagios.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/nagios.rb b/jobs/nagios.rb index 1ea1444..71dadc4 100644 --- a/jobs/nagios.rb +++ b/jobs/nagios.rb @@ -67,7 +67,7 @@ SCHEDULER.every '60s' do unknown_services = Array.new unacked.each do |alert| - next if ! alert["host"].include? env[:domain] + next if ! alert["host"].include? '.'+env[:domain] next if ! tried_at_maximum(alert["attempts"]) if alert["status"].eql? "CRITICAL" critical_count += 1 -- cgit v1.2.3 From 2407b513ff0e3763b6b8755d7804ef69a4a53893 Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 13 Sep 2017 09:30:23 +0200 Subject: Rename Nagios leap.se to Nagios Infrastructure --- README.md | 2 +- dashboards/dashboard.erb | 3 +-- jobs/nagios.rb | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e157049..7d04bcd 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,6 @@ For this dashboard you furthermore need nodejs installed, e.g. Use dashing to build the dashboard or start it locally. - dashing start + ./bin/dashing start See `dashing --help` for usage. diff --git a/dashboards/dashboard.erb b/dashboards/dashboard.erb index 50b81c6..fd677f9 100644 --- a/dashboards/dashboard.erb +++ b/dashboards/dashboard.erb @@ -9,7 +9,7 @@

@@ -22,4 +22,3 @@

- diff --git a/jobs/nagios.rb b/jobs/nagios.rb index 71dadc4..97e5ae8 100644 --- a/jobs/nagios.rb +++ b/jobs/nagios.rb @@ -38,12 +38,12 @@ SCHEDULER.every '60s' do username: 'nagiosadmin', password: ENV['NAGIOS_UNSTABLE_PASS'] }, - leap: { + infrastructure: { domain: 'leap.se', query_url: 'https://hare.leap.se/cgi-bin/nagios3/', home_url: 'https://hare.leap.se/nagios3/', username: 'nagiosadmin', - password: ENV['NAGIOS_LEAP_PASS'] + password: ENV['NAGIOS_INFRASTRUCTURE_PASS'] }, } -- cgit v1.2.3 From 6be3364b35fd83e7923358d3402e45010847b39b Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 13 Sep 2017 09:49:30 +0200 Subject: Restructure dashboard layot --- dashboards/dashboard.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dashboards/dashboard.erb b/dashboards/dashboard.erb index fd677f9..d7a5a06 100644 --- a/dashboards/dashboard.erb +++ b/dashboards/dashboard.erb @@ -5,20 +5,20 @@

- -

+ +

-- cgit v1.2.3 From 96f37b3d7d659fda3e38fba6edba7cd374e6866b Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 13 Sep 2017 10:38:17 +0200 Subject: Add user.leap.se --- dashboards/dashboard.erb | 3 +++ jobs/nagios.rb | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dashboards/dashboard.erb b/dashboards/dashboard.erb index d7a5a06..619d594 100644 --- a/dashboards/dashboard.erb +++ b/dashboards/dashboard.erb @@ -16,6 +16,9 @@

diff --git a/jobs/nagios.rb b/jobs/nagios.rb index 97e5ae8..2542f20 100644 --- a/jobs/nagios.rb +++ b/jobs/nagios.rb @@ -45,6 +45,13 @@ SCHEDULER.every '60s' do username: 'nagiosadmin', password: ENV['NAGIOS_INFRASTRUCTURE_PASS'] }, + user_leap_se: { + domain: 'leap.i', + query_url: 'https://user.leap.se/cgi-bin/nagios3/', + home_url: 'https://user.leap.se/nagios3/', + username: 'nagiosadmin', + password: ENV['NAGIOS_USER_LEAP_SE_PASS'] + }, } @@ -52,7 +59,7 @@ SCHEDULER.every '60s' do environments.each do |key, env| begin nag = NagiosHarder::Site.new(env[:query_url], env[:username], env[:password],'3','iso8601') - #puts nag + puts nag unacked = nag.service_status( :host_status_types => [:all], :service_status_types => [:warning, :critical, :unknown], -- cgit v1.2.3 From e6a20df9d772cfc1ae1224ad846e827b846f42c3 Mon Sep 17 00:00:00 2001 From: Varac Date: Tue, 3 Oct 2017 18:18:21 +0200 Subject: Dont show "manual" build status as warning on dashboard --- jobs/gitlab_build_status.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/gitlab_build_status.rb b/jobs/gitlab_build_status.rb index 78867cd..560bec3 100644 --- a/jobs/gitlab_build_status.rb +++ b/jobs/gitlab_build_status.rb @@ -12,7 +12,7 @@ SCHEDULER.every '120s', :first_in => 0 do GitlabStats.add_pipeline_stats_to proj puts "#{Time.now} gitlab: #{proj[:name]} (#{proj[:ref]}): #{proj[:status]}" - unless proj[:status] =~ /^success|running|No builds configured/ + unless proj[:status] =~ /^success|running|manual|No builds configured/ broken_builds << proj end if proj[:status] == 'running' -- cgit v1.2.3 From 1fddfe5eaf83b1c54fa8761c7ef7a89ea913358e Mon Sep 17 00:00:00 2001 From: Varac Date: Wed, 4 Oct 2017 08:42:43 +0200 Subject: 0xacab.org: All Builds Are Complete --- widgets/gitlab_build_status/gitlab_build_status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/gitlab_build_status/gitlab_build_status.html b/widgets/gitlab_build_status/gitlab_build_status.html index cb2f566..504062d 100644 --- a/widgets/gitlab_build_status/gitlab_build_status.html +++ b/widgets/gitlab_build_status/gitlab_build_status.html @@ -10,7 +10,7 @@

All Gitlab builds are successful

0xacab.org: All Builds Are Complete!

-- cgit v1.2.3 From 2917ad9519d6f872d51582d335a147bf2e5f935e Mon Sep 17 00:00:00 2001 From: Varac Date: Mon, 16 Oct 2017 14:17:27 +0200 Subject: Update Gemfile.lock --- Gemfile.lock | 64 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9629ed0..8b92256 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,42 +1,42 @@ PATH remote: . specs: - dashing (1.3.6) + smashing (1.0.0) coffee-script (~> 2.2.0) crack execjs (~> 2.0.2) gitlab nagiosharder rack (~> 1.5.4) - rufus-scheduler (~> 2.0.24) + rufus-scheduler (~> 3.2.0) sass (~> 3.2.12) sinatra (~> 1.4.4) sinatra-contrib (~> 1.4.2) sprockets (~> 2.10.1) thin (~> 1.6.1) - thor (> 0.18.1) + thor (~> 0.19) GEM remote: https://rubygems.org/ specs: - activesupport (4.2.7.1) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - backports (3.6.8) + backports (3.10.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) crack (0.4.3) safe_yaml (~> 1.0.0) daemons (1.2.4) docile (1.1.5) - domain_name (0.5.20160826) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - eventmachine (1.2.0.1) + eventmachine (1.2.5) execjs (2.0.2) fakeweb (1.3.0) gitlab (4.2.0) @@ -48,18 +48,18 @@ GEM hike (1.2.3) http-cookie (1.0.3) domain_name (~> 0.5) - httparty (0.14.0) + httparty (0.15.6) multi_xml (>= 0.5.2) - i18n (0.7.0) - json (1.8.3) + i18n (0.9.0) + concurrent-ruby (~> 1.0) metaclass (0.0.4) mime-types (2.6.2) - mini_portile2 (2.1.0) + mini_portile2 (2.3.0) minitest (5.2.3) mocha (0.14.0) metaclass (~> 0.0.1) - multi_json (1.12.1) - multi_xml (0.5.5) + multi_json (1.12.2) + multi_xml (0.6.0) nagiosharder (0.5.0) activesupport hashie (~> 1.2.0) @@ -69,22 +69,19 @@ GEM rest-client terminal-table netrc (0.11.0) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - pkg-config (1.1.7) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) rack (1.5.5) rack-protection (1.5.3) rack - rack-test (0.6.3) - rack (>= 1.0) + rack-test (0.7.0) + rack (>= 1.0, < 3) rake (10.1.1) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rufus-scheduler (2.0.24) - tzinfo (>= 0.3.22) + rufus-scheduler (3.2.2) safe_yaml (1.0.4) sass (3.2.19) simplecov (0.8.2) @@ -92,7 +89,7 @@ GEM multi_json simplecov-html (~> 0.8.0) simplecov-html (0.8.0) - sinatra (1.4.7) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) @@ -108,37 +105,38 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - terminal-table (1.7.3) - unicode-display_width (~> 1.1.1) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) thin (1.6.4) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) + thor (0.20.0) + thread_safe (0.3.6) tilt (1.4.1) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.1) + unf_ext (0.0.7.4) + unicode-display_width (1.3.0) PLATFORMS ruby DEPENDENCIES activesupport (< 5.0.0) - dashing! fakeweb (~> 1.3.0) gitlab haml (~> 4.0.4) mime-types (= 2.6.2) minitest (~> 5.2.0) mocha (~> 0.14.0) + nagiosharder rake (~> 10.1.0) rest-client (< 2.0.0) simplecov (~> 0.8.2) + smashing! BUNDLED WITH - 1.14.6 + 1.15.2 -- cgit v1.2.3

Drats! That Dashboard doesn't exist.

FAILED

All builds are successful

Error querying Nagios

critical

criticals

warning

warnings

unkown

GitLab

FAILED

All Gitlab builds are successful

GitLab

FAILED

FAILED

All builds are successful

All Gitlab builds are successful

RUNNING

All Gitlab builds are successful

0xacab.org: All Builds Are Complete!