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

diff --cc prometheus/burrow-prometheus.c
index ffef3c064dede7aecf40574fed83487780b521d9,188af4525915dc0e1e48eaeac24e312fb6cc240c..d68f55fb24fa8b267a381282460723c6b54c3ea3
--- 1/prometheus/burrow-prometheus.c
--- 2/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",