gri 10.0.0 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4c84175fc709e40d212ba2e061702b661b7af37
-  data.tar.gz: da221f34b501545a97daa79da88a8432c22adbd2
+  metadata.gz: 4eb6644b6a0c8a97bfc6bb59bdbcb67dfc3db587
+  data.tar.gz: 5a686fa5f77d255b4a9d4632639445ce95b08d55
 SHA512:
-  metadata.gz: c445fdeeb8c6bf84b6caedcafe31225b0c604173a2d4e6ca0a0fe5d79dde171d834c0d3016b3abee9e29ac1227ccb362f472936046e49aeabe55c3ede6b53af0
-  data.tar.gz: 9c67f041a8117dfd3d0c25ac1e17b64b0aae7473ed9ba632f3ed0e796bfc0c5f68c714b5a7d9ac8030177ddef9da3bd60edd74a07b44bc2ff560d8d423d1d190
+  metadata.gz: 1510485c0bd6cedfc980ea7d1b13752a20135127c2a771593f5f61009caed1452ce4f291ca2e6ca66b0b629e26b3ff91f5e7f3235073bb2b318f4b2a9f85d178
+  data.tar.gz: a647d54ebf6b8084c0b6018da050f646826336d43b6c0c58d2b3ff4fd86faeffdfd92797a7a9ea68aa5a09bec2ae7ff6d5ef66b0a59c40a0cc9f5370398459b4

data/lib/gri/graph.rb

@@ -166,6 +166,7 @@ module GRI
     def call env
       req = GRI::Request.new env
       params = req.gparams
+      ENV['TZ'] = Config['tz'] if Config['tz']
       ENV['TZ'] = params['tz'].to_s unless params['tz'].blank?
       stime, etime = req.params['stime'].to_i, req.params['etime'].to_i
       etime = (Time.now + etime).to_i if etime <= 0

data/lib/gri/page.rb

@@ -153,6 +153,7 @@ module GRI
 
     def call env
       req = GRI::Request.new env
+      ENV['TZ'] = Config['tz'] if Config['tz']
       ENV['TZ'] = req.params['tz'].to_s unless req.params['tz'].blank?
       stime, etime, params = parse_request req
 

data/lib/gri/version.rb

@@ -1,3 +1,3 @@
 module GRI
-  VERSION = "10.0.0"
+  VERSION = "10.0.1"
 end

data/lib/gri/writer.rb

@@ -83,6 +83,7 @@ module GRI
       unless @sysinfos.empty?
         if @options[:merge_p]
           path = "#{@gra_dir}/.sysdb/sysdb.tmp.#{$$}"
+          FileUtils.mkdir_p File.dirname(path) unless File.exist? path
           open(path, 'w') {|f| LTSV.dump_to_io @sysinfos, f}
         else
           path = "#{@gra_dir}/.sysdb/sysdb.txt"

data/misc/Dockerfile

@@ -0,0 +1,33 @@
+FROM centos
+
+# cron
+RUN yum install -y cronie
+RUN sed -i -e 's/^session.*required.*pam_loginuid.so/# session\trequired\tpam_loginuid.so/g' /etc/pam.d/crond
+
+# httpd
+RUN yum install -y httpd
+
+# ruby
+RUN yum install -y rubygems
+RUN gem install gri --no-ri --no-rdoc
+RUN cp /usr/bin/grapher /var/www/cgi-bin/
+
+# rrdtool
+RUN yum install -y cairo gettext pango tcp_wrappers-libs libdbi
+RUN yum install -y xorg-x11-fonts-Type1 ipa-gothic-fonts ipa-pgothic-fonts
+RUN (cd /tmp; wget http://pkgs.repoforge.org/rrdtool/rrdtool-1.4.7-1.el6.rfx.x86_64.rpm)
+RUN (cd /tmp; rpm --nodeps -i rrdtool-1.4.7-1.el6.rfx.x86_64.rpm)
+
+# admin
+RUN useradd -u 10000 admin
+
+# setup
+RUN mkdir -p /usr/local/gri; chown admin /usr/local/gri
+RUN echo '*/5 * * * * admin /usr/bin/gri' >>/etc/crontab
+RUN cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
+
+# sudo docker build -t gri -rm .
+# sudo docker run -p 10080:80 -v /somewhere/gri:/usr/local/gri:rw -i -t gri /bin/bash
+# bash# /etc/rc.d/init.d/crond start
+# bash# /etc/init.d/httpd start
+# bash# vi /usr/local/gri/gritab

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gri
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.0.1
 platform: ruby
 authors:
 - maebashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -102,6 +102,7 @@ files:
 - lib/gri/wmain.rb
 - lib/gri/writer.rb
 - mcollector
+- misc/Dockerfile
 - test/mock.rb
 - test/root/gra/.sysdb/sysdb.txt
 - test/root/gra/testhost/.records.txt