Commit 52a68519 authored by Karl's avatar Karl

Fix merge

parent d6770a38
UserParameter=rpi.cpuClock,/opt/vc/bin/vcgencmd measure_clock arm|cut -d"=" -f2 UserParameter=rpi.cpuClock,/opt/vc/bin/vcgencmd measure_clock arm|cut -d"=" -f2
UserParameter=rpi.cpuVoltage,/opt/vc/bin/vcgencmd measure_volts | tr -d "volt=" | tr -d "V" UserParameter=rpi.cpuVoltage,/opt/vc/bin/vcgencmd measure_volts | tr -d "volt=" | tr -d "V"
<<<<<<< HEAD
UserParameter=rpi.cpuTemperature,cat /sys/class/thermal/thermal_zone*/temp UserParameter=rpi.cpuTemperature,cat /sys/class/thermal/thermal_zone*/temp
UserParameter=rpi.cpuThrottled,/opt/vc/bin/vcgencmd get_throttled|cut -d'=' -f2 UserParameter=rpi.cpuThrottled,/opt/vc/bin/vcgencmd get_throttled|cut -d'=' -f2
======= \ No newline at end of file
UserParameter=rpi.cpuTemperature,cat /sys/class/thermal/thermal_zone*/temp
>>>>>>> 76c53134b782140ec2624aee1bdc96b75b1ace27
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<zabbix_export> <zabbix_export>
<version>4.0</version> <version>4.0</version>
<<<<<<< HEAD
<date>2020-04-08T10:09:45Z</date> <date>2020-04-08T10:09:45Z</date>
=======
<date>2020-01-22T08:35:29Z</date>
>>>>>>> 76c53134b782140ec2624aee1bdc96b75b1ace27
<groups> <groups>
<group> <group>
<name>Templates</name> <name>Templates</name>
...@@ -214,7 +210,6 @@ ...@@ -214,7 +210,6 @@
<verify_host>0</verify_host> <verify_host>0</verify_host>
<master_item/> <master_item/>
</item> </item>
<<<<<<< HEAD
<item> <item>
<name>CPU voltage</name> <name>CPU voltage</name>
<type>7</type> <type>7</type>
...@@ -274,8 +269,6 @@ ...@@ -274,8 +269,6 @@
<verify_host>0</verify_host> <verify_host>0</verify_host>
<master_item/> <master_item/>
</item> </item>
=======
>>>>>>> 76c53134b782140ec2624aee1bdc96b75b1ace27
</items> </items>
<discovery_rules/> <discovery_rules/>
<httptests/> <httptests/>
...@@ -301,7 +294,6 @@ ...@@ -301,7 +294,6 @@
<dependencies/> <dependencies/>
<tags/> <tags/>
</trigger> </trigger>
<<<<<<< HEAD
<trigger> <trigger>
<expression>{Raspberry Pi:rpi.cpuTemperature.last()}&gt;=70</expression> <expression>{Raspberry Pi:rpi.cpuTemperature.last()}&gt;=70</expression>
<recovery_mode>0</recovery_mode> <recovery_mode>0</recovery_mode>
...@@ -318,7 +310,5 @@ ...@@ -318,7 +310,5 @@
<dependencies/> <dependencies/>
<tags/> <tags/>
</trigger> </trigger>
=======
>>>>>>> 76c53134b782140ec2624aee1bdc96b75b1ace27
</triggers> </triggers>
</zabbix_export> </zabbix_export>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment