From: Martin Mares <mj@ucw.cz>
Date: Mon, 27 Aug 2018 19:10:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/home-hw
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=64df32d112a2e12809067d54627a116f68bc6413;p=home-hw.git

Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/home-hw
---

64df32d112a2e12809067d54627a116f68bc6413
diff --cc prometheus/burrow-prometheus.c
index ffef3c0,188af45..d68f55f
--- a/prometheus/burrow-prometheus.c
+++ b/prometheus/burrow-prometheus.c
@@@ -74,16 -74,16 +74,16 @@@ static const struct attr attr_table[] 
  		.topic = "burrow/temp/garage"
  	},
  	{
 -		.metric = "temp_machinarium",
 -		.help = "Temperature in the Machinarium [degC]",
 +		.metric = "temp_kitchen",
 +		.help = "Temperature in the kitchen [degC]",
  		.type = "gauge",
 -		.topic = "burrow/temp/machinarium"
 +		.topic = "burrow/temp/kitchen"
  	},
  	{
--		.metric = "rh_garage",
 -		.help = "Relative humidity in the garage [%]",
++		.metric = "rh_ursarium",
 +		.help = "Relative humidity in the Ursarium [%]",
  		.type = "gauge",
 -		.topic = "burrow/temp/garage-rh"
 +		.topic = "burrow/temp/ursarium-rh"
  	},
  	{
  		.metric = "temp_catarium_clock",