Skip to content

Show Hauptraum-Power-Consumption instead of (defunct) Payback Points #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Show Hauptraum-Power-Consumption instead of (defunct) Payback Points #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23d9a4c
Show present members
silsha Nov 9, 2016
2ba2de9
Merge branch 'master' of https://github.com/silsha/infoscreen-v6
Nov 9, 2016
3e5b85a
Merge branch 'master' of https://github.com/silsha/infoscreen-v6
Aug 5, 2017
842db47
Show Hauptraum-Power-Consumption instead of (defunct) Payback Points
Ranlvor Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dashboards/rzl.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ $(function() {
<div data-id="Kontostand" data-view="Number" data-title="Kontostand" data-prefix="€"></div>
</li>

<li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
<!-- <li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
<div data-id="Payback_Punkte" data-view="Number" data-title="Payback"></div>
</li>
-->
<li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
<div data-id="Stromverbrauch_Hauptraum" data-view="Graph" data-title="Strom Hauptraum" data-suffix="kW"></div>
</li>

<li data-row="2" data-col="1" data-sizex="1" data-sizey="1">
<div data-id="Temperatur_Beamerplattform" data-view="Graph" data-title="Temperatur" data-suffix="°C"></div>
Expand Down
2 changes: 1 addition & 1 deletion jobs/grafana.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
begin
# Instatiates an empty data hash. This will store our variables and associated Xively value.
data = {}
grafana_data = HTTParty.post('http://kunterbunt.vm.rzl/api/datasources/proxy/1/render', { :body => 'target=alias(rzl.service.heizung.temp.beamerplattform%2C%20\'Temperatur_Beamerplattform\')&from=-24h&until=now&format=json&maxDataPoints=10'})
grafana_data = HTTParty.post('http://kunterbunt.vm.rzl/api/datasources/proxy/1/render', { :body => 'target=alias(rzl.service.heizung.temp.beamerplattform%2C%20\'Temperatur_Beamerplattform\')&target=alias(scale(rzl.service.power.hauptraum.power%2C%200.001)%2C%20\'Stromverbrauch_Hauptraum\')&from=-24h&until=now&format=json&maxDataPoints=50'})
# This code assigns the variables to incoming Xively data and stores the result in a hash
grafana_data.each do |n|
data[n['target']] = n
Expand Down
2 changes: 1 addition & 1 deletion jobs/status.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'net/http'
require 'uri'
require 'json'
require 'JSON'

url = URI.parse("http://s.rzl.so/api/full.json")

Expand Down