From 64d058f472b80477330b7f658a6bdae7670d6d7d Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Fri, 24 Feb 2017 15:11:57 +0100 Subject: Revert "sensu: 0.17.1 -> 0.28.0" This reverts commit 4588f94396c72334ed40a2c3eda51f18a33f03c4. Because it breaks nixpkgs evaluation. --- pkgs/servers/monitoring/sensu/Gemfile.lock | 120 +++++++-------- pkgs/servers/monitoring/sensu/default.nix | 27 ++-- pkgs/servers/monitoring/sensu/gemset.nix | 238 ++++++++++++++++++----------- 3 files changed, 218 insertions(+), 167 deletions(-) diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index ee425b6edf97..9f58be03b621 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -1,79 +1,75 @@ GEM remote: https://rubygems.org/ specs: - amq-protocol (2.0.1) - amqp (1.6.0) - amq-protocol (>= 2.0.1) + amq-protocol (1.9.2) + amqp (1.5.0) + amq-protocol (>= 1.9.2) eventmachine - childprocess (0.5.8) + async_sinatra (1.0.0) + rack (>= 1.4.1) + sinatra (>= 1.3.2) + childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) - em-http-server (0.1.8) - eventmachine + daemons (1.2.2) + em-redis-unified (0.6.0) + eventmachine (>= 0.12.10) em-worker (0.0.2) eventmachine - eventmachine (1.2.2) - ffi (1.9.17) - oj (2.14.6) - parse-cron (0.1.4) - sensu (0.28.0) - em-http-server (= 0.1.8) - eventmachine (= 1.2.2) - parse-cron (= 0.1.4) - sensu-extension (= 1.5.1) - sensu-extensions (= 1.7.1) - sensu-json (= 2.0.1) - sensu-logger (= 1.2.1) - sensu-redis (= 2.1.0) - sensu-settings (= 9.9.0) - sensu-spawn (= 2.2.1) - sensu-transport (= 7.0.2) - sensu-extension (1.5.1) - eventmachine - sensu-extensions (1.7.1) + eventmachine (1.0.3) + ffi (1.9.8) + multi_json (1.11.0) + rack (1.6.0) + rack-protection (1.5.3) + rack + sensu (0.17.1) + async_sinatra (= 1.0.0) + em-redis-unified (= 0.6.0) + eventmachine (= 1.0.3) + multi_json (= 1.11.0) + sensu-em (= 2.4.1) + sensu-extension (= 1.1.2) + sensu-extensions (= 1.2.0) + sensu-logger (= 1.0.0) + sensu-settings (= 1.3.0) + sensu-spawn (= 1.1.0) + sensu-transport (= 2.4.0) + sinatra (= 1.3.5) + thin (= 1.5.0) + uuidtools (= 2.1.4) + sensu-em (2.4.1) + sensu-extension (1.1.2) + sensu-em + sensu-extensions (1.2.0) + multi_json + sensu-em sensu-extension - sensu-extensions-debug (= 1.0.0) - sensu-extensions-json (= 1.0.0) - sensu-extensions-occurrences (= 1.1.0) - sensu-extensions-only-check-output (= 1.0.0) - sensu-extensions-ruby-hash (= 1.0.0) - sensu-json (>= 1.1.0) sensu-logger sensu-settings - sensu-extensions-debug (1.0.0) - sensu-extension - sensu-extensions-json (1.0.0) - sensu-extension - sensu-extensions-occurrences (1.1.0) - sensu-extension - sensu-extensions-only-check-output (1.0.0) - sensu-extension - sensu-extensions-ruby-hash (1.0.0) - sensu-extension - sensu-json (2.0.1) - oj (= 2.14.6) - sensu-logger (1.2.1) - eventmachine - sensu-json - sensu-redis (2.1.0) - eventmachine - sensu-settings (9.9.0) - parse-cron - sensu-json (>= 1.1.0) - sensu-spawn (2.2.1) - childprocess (= 0.5.8) + sensu-logger (1.0.0) + multi_json + sensu-em + sensu-settings (1.3.0) + multi_json + sensu-spawn (1.1.0) + childprocess (= 0.5.3) em-worker (= 0.0.2) - eventmachine - sensu-transport (7.0.2) - amq-protocol (= 2.0.1) - amqp (= 1.6.0) - eventmachine - sensu-redis (>= 1.0.0) + sensu-em + sensu-transport (2.4.0) + amqp (= 1.5.0) + sensu-em + sinatra (1.3.5) + rack (~> 1.4) + rack-protection (~> 1.3) + tilt (~> 1.3, >= 1.3.3) + thin (1.5.0) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) + tilt (1.4.1) + uuidtools (2.1.4) PLATFORMS ruby DEPENDENCIES sensu - -BUNDLED WITH - 1.14.4 diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index ab896766272c..ecc1d4109843 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -1,17 +1,16 @@ -{ lib, bundlerEnv, ruby }: + { lib, bundlerEnv, ruby }: -bundlerEnv { - name = "sensu-${version}"; - version = (import gemset).sensu.version; + bundlerEnv { + name = "sensu-0.17.1"; - inherit ruby; - gemdir = ./.; + inherit ruby; + gemdir = ./.; - meta = with lib; { - description = "A monitoring framework that aims to be simple, malleable, and scalable"; - homepage = http://sensuapp.org/; - license = licenses.mit; - maintainers = with maintainers; [ theuni peterhoeg ]; - platforms = platforms.unix; - }; -} + meta = with lib; { + description = "A monitoring framework that aims to be simple, malleable, and scalable"; + homepage = http://sensuapp.org/; + license = licenses.mit; + maintainers = with maintainers; [ theuni ]; + platforms = platforms.unix; + }; + } diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix index 273496e2fb42..116bce9c4b53 100644 --- a/pkgs/servers/monitoring/sensu/gemset.nix +++ b/pkgs/servers/monitoring/sensu/gemset.nix @@ -1,186 +1,242 @@ { - amq-protocol = { + "amq-protocol" = { + version = "1.9.2"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x"; type = "gem"; + sha256 = "1gl479j003vixfph5jmdskl20il8816y0flp4msrc8im3b5iiq3r"; }; - version = "2.0.1"; }; - amqp = { + "amqp" = { + version = "1.5.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9"; type = "gem"; + sha256 = "0jlcwyvjz0b28wxdabkyhdqyqp5ji56ckfywsy9mgp0m4wfbrh8c"; }; - version = "1.6.0"; + dependencies = [ + "amq-protocol" + "eventmachine" + ]; }; - childprocess = { + "async_sinatra" = { + version = "1.0.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0"; type = "gem"; + sha256 = "02yi9qfsi8kk4a4p1c4sx4pgism05m18kwlc9dd23zzdy9jdgq1a"; }; - version = "0.5.8"; + dependencies = [ + "rack" + "sinatra" + ]; }; - em-http-server = { + "childprocess" = { + version = "0.5.3"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5"; type = "gem"; + sha256 = "12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww"; }; - version = "0.1.8"; + dependencies = [ + "ffi" + ]; }; - em-worker = { - dependencies = ["eventmachine"]; + "daemons" = { + version = "1.2.2"; source = { - sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; type = "gem"; + sha256 = "121c7vkimg3baxga69xvdkwxiq8wkmxqvdbyqi5i82vhih5d3cn3"; }; - version = "0.0.2"; }; - eventmachine = { + "em-redis-unified" = { + version = "0.6.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "00mlcq33q104spkb5c997lwallpilhj0d6fzsbd4lr9s8lmjga5f"; type = "gem"; + sha256 = "1hf7dv6qmxfilpd7crcqlyqk6jp5z8md76bpg3n0163ps4ra73p0"; }; - version = "1.2.2"; + dependencies = [ + "eventmachine" + ]; }; - ffi = { + "em-worker" = { + version = "0.0.2"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; type = "gem"; + sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; }; - version = "1.9.17"; + dependencies = [ + "eventmachine" + ]; }; - oj = { + "eventmachine" = { + version = "1.0.3"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk"; type = "gem"; + sha256 = "09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil"; }; - version = "2.14.6"; }; - parse-cron = { + "ffi" = { + version = "1.9.8"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg"; type = "gem"; + sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879"; }; - version = "0.1.4"; }; - sensu = { + "multi_json" = { + version = "1.11.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx"; type = "gem"; + sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; }; - version = "0.28.0"; }; - sensu-extension = { + "rack" = { + version = "1.6.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lgmjxfbq11v4yi3qanf1qxv0sgm1a8a7wj7qyn1nkva6zmimss3"; type = "gem"; + sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb"; }; - version = "1.5.1"; }; - sensu-extensions = { + "rack-protection" = { + version = "1.5.3"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g"; type = "gem"; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; }; - version = "1.7.1"; + dependencies = [ + "rack" + ]; }; - sensu-extensions-debug = { + "sensu" = { + version = "0.17.1"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp"; type = "gem"; + sha256 = "1fqpypins1zhind0in0ax0y97a6pf3z85gwjz4bjm6cjrkarb5zj"; }; - version = "1.0.0"; + dependencies = [ + "async_sinatra" + "em-redis-unified" + "eventmachine" + "multi_json" + "sensu-em" + "sensu-extension" + "sensu-extensions" + "sensu-logger" + "sensu-settings" + "sensu-spawn" + "sensu-transport" + "sinatra" + "thin" + "uuidtools" + ]; }; - sensu-extensions-json = { + "sensu-em" = { + version = "2.4.1"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g"; type = "gem"; + sha256 = "08jz47lfnv55c9yl2dhyv1si6zl8h4xj8y1sjy2h2fqy48prfgmy"; }; - version = "1.0.0"; }; - sensu-extensions-occurrences = { + "sensu-extension" = { + version = "1.1.2"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja"; type = "gem"; + sha256 = "19qz22fcb3xjz9p5npghlcvxkf8h1rsfws3j988ybnimmmmiqm24"; }; - version = "1.1.0"; + dependencies = [ + "sensu-em" + ]; }; - sensu-extensions-only-check-output = { + "sensu-extensions" = { + version = "1.2.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3"; type = "gem"; + sha256 = "1b8978g1ww7vdrsw7zvba6qvc56s4vfm1hw3szw3j1gsk6j0vb81"; }; + dependencies = [ + "multi_json" + "sensu-em" + "sensu-extension" + "sensu-logger" + "sensu-settings" + ]; + }; + "sensu-logger" = { version = "1.0.0"; + source = { + type = "gem"; + sha256 = "0vwa2b5wa9xqzb9lmhma49171iabwbnnnyhhhaii8n6j4axvar93"; + }; + dependencies = [ + "multi_json" + "sensu-em" + ]; }; - sensu-extensions-ruby-hash = { + "sensu-settings" = { + version = "1.3.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3"; type = "gem"; + sha256 = "0s9fyqhq5vf9m9937n3wczlr4z62rn1ydc6m53vn4156fpim6yga"; }; - version = "1.0.0"; + dependencies = [ + "multi_json" + ]; }; - sensu-json = { + "sensu-spawn" = { + version = "1.1.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4"; type = "gem"; + sha256 = "0w9z6hpr27lq02y6c2mnrdl9xpsjfg77kzsfsp2f2w4swdwmiv0v"; }; - version = "2.0.1"; + dependencies = [ + "childprocess" + "em-worker" + "sensu-em" + ]; }; - sensu-logger = { + "sensu-transport" = { + version = "2.4.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "03kicjqz8a594bxnwyg6bcd4fipy2vxjl1gbaip4gpixxki32dx0"; type = "gem"; + sha256 = "0gh8rcl22daax7qng93kj2jydql1jhhskd37kj7sgz0rr8wy2x06"; }; - version = "1.2.1"; + dependencies = [ + "amqp" + "sensu-em" + ]; }; - sensu-redis = { + "sinatra" = { + version = "1.3.5"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg"; type = "gem"; + sha256 = "1mn6nzfyirfqr7prhsn4nr3k481c6nzsad2p9s1xnsbvxa1vkqwr"; }; - version = "2.1.0"; + dependencies = [ + "rack" + "rack-protection" + "tilt" + ]; }; - sensu-settings = { + "thin" = { + version = "1.5.0"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i"; type = "gem"; + sha256 = "14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1"; }; - version = "9.9.0"; + dependencies = [ + "daemons" + "eventmachine" + "rack" + ]; }; - sensu-spawn = { + "tilt" = { + version = "1.4.1"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vz5kbqk3ld0s16zjl8m38l1m1xwcvjlfc1g4nfm45qxdyfn7la7"; type = "gem"; + sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; }; - version = "2.2.1"; }; - sensu-transport = { + "uuidtools" = { + version = "2.1.4"; source = { - remotes = ["https://rubygems.org"]; - sha256 = "15yib92hwyd8v04wcc0kaw0p8w2c2mwvi4ldya2jh3dqgs31mvhr"; type = "gem"; + sha256 = "1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3"; }; - version = "7.0.2"; }; } \ No newline at end of file -- cgit 1.4.1