Hello community, here is the log from the commit of package health-checker for openSUSE:Factory checked in at 2019-03-01 20:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/health-checker (Old) and /work/SRC/openSUSE:Factory/.health-checker.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "health-checker" Fri Mar 1 20:26:30 2019 rev:8 rq:679841 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/health-checker/health-checker.changes 2019-02-08 13:45:52.670826303 +0100 +++ /work/SRC/openSUSE:Factory/.health-checker.new.28833/health-checker.changes 2019-03-01 20:26:31.834053222 +0100 @@ -1,0 +2,6 @@ +Wed Feb 27 15:20:11 CET 2019 - ku...@suse.de + +- Update to version 1.2 + * Add hooks to send telemetrics events + +------------------------------------------------------------------- Old: ---- health-checker-1.1.tar.xz New: ---- health-checker-1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ health-checker.spec ++++++ --- /var/tmp/diff_new_pack.AZSHxQ/_old 2019-03-01 20:26:33.202052892 +0100 +++ /var/tmp/diff_new_pack.AZSHxQ/_new 2019-03-01 20:26:33.242052882 +0100 @@ -17,7 +17,7 @@ Name: health-checker -Version: 1.1 +Version: 1.2 Release: 0 Summary: Service for verifying that important services are running License: GPL-2.0-only ++++++ health-checker-1.1.tar.xz -> health-checker-1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/Makefile.in new/health-checker-1.2/Makefile.in --- old/health-checker-1.1/Makefile.in 2019-02-04 10:55:19.000000000 +0100 +++ new/health-checker-1.2/Makefile.in 2019-02-27 15:13:47.000000000 +0100 @@ -154,7 +154,7 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in COPYING INSTALL NEWS \ +am__DIST_COMMON = $(srcdir)/Makefile.in COPYING ChangeLog INSTALL NEWS \ install-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/NEWS new/health-checker-1.2/NEWS --- old/health-checker-1.1/NEWS 2019-02-04 10:55:14.000000000 +0100 +++ new/health-checker-1.2/NEWS 2019-02-27 15:13:41.000000000 +0100 @@ -2,6 +2,9 @@ Copyright (C) 2017-2019 Thorsten Kukuk +Version 1.2 +* Add hooks for telemetrics events + Version 1.1 * Add checks for kubelet and crio diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/configure new/health-checker-1.2/configure --- old/health-checker-1.1/configure 2019-02-04 10:55:21.000000000 +0100 +++ new/health-checker-1.2/configure 2019-02-27 15:13:47.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for health-checker 1.1. +# Generated by GNU Autoconf 2.69 for health-checker 1.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ # Identity of this package. PACKAGE_NAME='health-checker' PACKAGE_TARNAME='health-checker' -PACKAGE_VERSION='1.1' -PACKAGE_STRING='health-checker 1.1' +PACKAGE_VERSION='1.2' +PACKAGE_STRING='health-checker 1.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1210,7 +1210,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures health-checker 1.1 to adapt to many kinds of systems. +\`configure' configures health-checker 1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1276,7 +1276,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of health-checker 1.1:";; + short | recursive ) echo "Configuration of health-checker 1.2:";; esac cat <<\_ACEOF @@ -1356,7 +1356,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -health-checker configure 1.1 +health-checker configure 1.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1373,7 +1373,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by health-checker $as_me 1.1, which was +It was created by health-checker $as_me 1.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2236,7 +2236,7 @@ # Define the identity of the package. PACKAGE='health-checker' - VERSION='1.1' + VERSION='1.2' cat >>confdefs.h <<_ACEOF @@ -3121,7 +3121,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by health-checker $as_me 1.1, which was +This file was extended by health-checker $as_me 1.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3174,7 +3174,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -health-checker config.status 1.1 +health-checker config.status 1.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/configure.ac new/health-checker-1.2/configure.ac --- old/health-checker-1.1/configure.ac 2019-02-04 10:54:50.000000000 +0100 +++ new/health-checker-1.2/configure.ac 2019-02-27 15:12:43.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(health-checker, 1.1) +AC_INIT(health-checker, 1.2) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([sbin/health-checker.in]) AC_PREFIX_DEFAULT(/usr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/dracut/Makefile.in new/health-checker-1.2/dracut/Makefile.in --- old/health-checker-1.1/dracut/Makefile.in 2019-02-04 10:55:19.000000000 +0100 +++ new/health-checker-1.2/dracut/Makefile.in 2019-02-27 15:13:47.000000000 +0100 @@ -248,9 +248,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dracut/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dracut/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu dracut/Makefile + $(AUTOMAKE) --foreign dracut/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/grub/Makefile.in new/health-checker-1.2/grub/Makefile.in --- old/health-checker-1.1/grub/Makefile.in 2019-02-04 10:55:19.000000000 +0100 +++ new/health-checker-1.2/grub/Makefile.in 2019-02-27 15:13:47.000000000 +0100 @@ -248,9 +248,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu grub/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign grub/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu grub/Makefile + $(AUTOMAKE) --foreign grub/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/man/Makefile.in new/health-checker-1.2/man/Makefile.in --- old/health-checker-1.1/man/Makefile.in 2019-02-04 10:55:19.000000000 +0100 +++ new/health-checker-1.2/man/Makefile.in 2019-02-27 15:13:47.000000000 +0100 @@ -269,9 +269,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --foreign man/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/man/health-checker.8 new/health-checker-1.2/man/health-checker.8 --- old/health-checker-1.1/man/health-checker.8 2019-02-04 10:55:42.000000000 +0100 +++ new/health-checker-1.2/man/health-checker.8 2019-02-25 21:36:27.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: health-checker .\" Author: Thorsten Kukuk <ku...@suse.de> .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/04/2019 +.\" Date: 02/25/2019 .\" Manual: health-checker .\" Source: health-checker .\" Language: English .\" -.TH "HEALTH\-CHECKER" "8" "02/04/2019" "health-checker" "health-checker" +.TH "HEALTH\-CHECKER" "8" "02/25/2019" "health-checker" "health-checker" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -51,6 +51,12 @@ \fBstop\fR\&. If called with "check", the plugin should verify that the service works and return 0, else 1\&. If one plugin returns "1", \fBhealth\-check\fR will evaluate what to do\&. If neither a rollback or reboot is usefull, all plugins will be called with the "stop" option\&. In this case, the plugins should shutdown the services are far as possible and usefull\&. +.SH "TELEMETRY" +.PP +If +\fBtelem-record-gen\fR(1) +is installed telemetry events are created additional to logging with +\fBsyslog\fR(3)\&. .SH "SEE ALSO" .PP \fBtransactional-update\fR(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/man/health-checker.8.html new/health-checker-1.2/man/health-checker.8.html --- old/health-checker-1.1/man/health-checker.8.html 2019-02-04 10:55:42.000000000 +0100 +++ new/health-checker-1.2/man/health-checker.8.html 2019-02-25 21:36:27.000000000 +0100 @@ -17,23 +17,27 @@ } </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.1</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up correctly after an update and reboot.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> --version </p></div><p><code class="filename">health-checker.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>health-checker</em></span> -checks during boot, if the system is coming up correct. -In error case, the action depends on what did happen before. If this is the -first boot after a transactional update, an automatic rollback to the last -known working snapshot is made. If the snapshot was already rebooted -successfull before, a reboot is tried. If this does not help, some sevices are -shutdown and an admin has to repair the system. -</p><p> -If the boot was successfull, the current snapshot is marked as known to be -working. -</p><p>Plugins are used for performing the tests and new plugins can be -written. They are stored in the -<code class="filename">/usr/lib/health-checker</code> directory and executed either -with the option <span class="command"><strong>check</strong></span> or <span class="command"><strong>stop</strong></span>. -If called with "check", the plugin should verify that the service works and -return 0, else 1. If one plugin returns "1", <span class="command"><strong>health-check</strong></span> -will evaluate what to do. If neither a rollback or reboot is usefull, all -plugins will be called with the "stop" option. In this case, the plugins + checks during boot, if the system is coming up correct. + In error case, the action depends on what did happen before. If this is the + first boot after a transactional update, an automatic rollback to the last + known working snapshot is made. If the snapshot was already rebooted + successfull before, a reboot is tried. If this does not help, some sevices + are shutdown and an admin has to repair the system. + </p><p> + If the boot was successfull, the current snapshot is marked as known to be + working. + </p><p>Plugins are used for performing the tests and new plugins can be + written. They are stored in the + <code class="filename">/usr/lib/health-checker</code> directory and executed either + with the option <span class="command"><strong>check</strong></span> or <span class="command"><strong>stop</strong></span>. + If called with "check", the plugin should verify that the service works and + return 0, else 1. If one plugin returns "1", <span class="command"><strong>health-check</strong></span> + will evaluate what to do. If neither a rollback or reboot is usefull, all + plugins will be called with the "stop" option. In this case, the plugins should shutdown the services are far as possible and usefull. -</p></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="transactional-update.8.html"><span class="citerefentry"><span class="refentrytitle">transactional-update</span>(8)</span></a> -</p></div></div></body></html> + </p></div><div class="refsect1"><a name="telemetry"></a><h2 id="TELEMETRY">TELEMETRY<a class="headerlink" title="Permalink to this headline" href="#TELEMETRY">¶</a></h2><p> + If <a href="telem-record-gen.1.html"><span class="citerefentry"><span class="refentrytitle">telem-record-gen</span>(1)</span></a> + is installed telemetry events are created additional to logging with + <a href="syslog.3.html"><span class="citerefentry"><span class="refentrytitle">syslog</span>(3)</span></a>. + </p></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="transactional-update.8.html"><span class="citerefentry"><span class="refentrytitle">transactional-update</span>(8)</span></a> + </p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/man/health-checker.8.xml new/health-checker-1.2/man/health-checker.8.xml --- old/health-checker-1.1/man/health-checker.8.xml 2019-02-04 10:23:51.000000000 +0100 +++ new/health-checker-1.2/man/health-checker.8.xml 2019-02-25 21:36:23.000000000 +0100 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" - "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"> +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"> <!-- \-*\- nroff \-*\- --> -<!-- Copyright 2017 Thorsten Kukuk <ku...@suse.de> --> +<!-- Copyright 2017, 2019 Thorsten Kukuk <ku...@suse.de> --> <!-- This program is free software; you can redistribute it and/or --> <!-- modify it under the terms of the GNU General Public License as --> @@ -59,35 +59,42 @@ </refsynopsisdiv> -<refsect1 id='description'><title>DESCRIPTION</title> -<para><emphasis remap='B'>health-checker</emphasis> -checks during boot, if the system is coming up correct. -In error case, the action depends on what did happen before. If this is the -first boot after a transactional update, an automatic rollback to the last -known working snapshot is made. If the snapshot was already rebooted -successfull before, a reboot is tried. If this does not help, some sevices are -shutdown and an admin has to repair the system. -</para> -<para> -If the boot was successfull, the current snapshot is marked as known to be -working. -</para> -<para>Plugins are used for performing the tests and new plugins can be -written. They are stored in the -<filename>/usr/lib/health-checker</filename> directory and executed either -with the option <command>check</command> or <command>stop</command>. -If called with "check", the plugin should verify that the service works and -return 0, else 1. If one plugin returns "1", <command>health-check</command> -will evaluate what to do. If neither a rollback or reboot is usefull, all -plugins will be called with the "stop" option. In this case, the plugins + <refsect1 id='description'><title>DESCRIPTION</title> + <para><emphasis remap='B'>health-checker</emphasis> + checks during boot, if the system is coming up correct. + In error case, the action depends on what did happen before. If this is the + first boot after a transactional update, an automatic rollback to the last + known working snapshot is made. If the snapshot was already rebooted + successfull before, a reboot is tried. If this does not help, some sevices + are shutdown and an admin has to repair the system. + </para> + <para> + If the boot was successfull, the current snapshot is marked as known to be + working. + </para> + <para>Plugins are used for performing the tests and new plugins can be + written. They are stored in the + <filename>/usr/lib/health-checker</filename> directory and executed either + with the option <command>check</command> or <command>stop</command>. + If called with "check", the plugin should verify that the service works and + return 0, else 1. If one plugin returns "1", <command>health-check</command> + will evaluate what to do. If neither a rollback or reboot is usefull, all + plugins will be called with the "stop" option. In this case, the plugins should shutdown the services are far as possible and usefull. -</para> -</refsect1> - -<refsect1 id='see_also'><title>SEE ALSO</title> -<para><citerefentry><refentrytitle>transactional-update</refentrytitle><manvolnum>8</manvolnum></citerefentry> -</para> -</refsect1> + </para> + </refsect1> + <refsect1 id='telemetry'><title>TELEMETRY</title> + <para> + If <citerefentry><refentrytitle>telem-record-gen</refentrytitle><manvolnum>1</manvolnum></citerefentry> + is installed telemetry events are created additional to logging with + <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>. + </para> + </refsect1> + + <refsect1 id='see_also'><title>SEE ALSO</title> + <para><citerefentry><refentrytitle>transactional-update</refentrytitle><manvolnum>8</manvolnum></citerefentry> + </para> + </refsect1> </refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/man/health-checker.service.8.html new/health-checker-1.2/man/health-checker.service.8.html --- old/health-checker-1.1/man/health-checker.service.8.html 2019-02-04 10:55:42.000000000 +0100 +++ new/health-checker-1.2/man/health-checker.service.8.html 2019-02-25 21:36:27.000000000 +0100 @@ -17,23 +17,27 @@ } </style><a href="health-checker.index.html">Index </a><span style="float:right">health-checker 1.1</span><hr><div class="refentry"><a name="health-checker.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>health-checker, health-checker.service — Checks that all important services of a system did come up correctly after an update and reboot.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> </p></div><div class="cmdsynopsis"><p><code class="command">/usr/sbin/health-checker</code> --version </p></div><p><code class="filename">health-checker.service</code></p></div><div class="refsect1"><a name="description"></a><h2 id="DESCRIPTION">DESCRIPTION<a class="headerlink" title="Permalink to this headline" href="#DESCRIPTION">¶</a></h2><p><span class="emphasis"><em>health-checker</em></span> -checks during boot, if the system is coming up correct. -In error case, the action depends on what did happen before. If this is the -first boot after a transactional update, an automatic rollback to the last -known working snapshot is made. If the snapshot was already rebooted -successfull before, a reboot is tried. If this does not help, some sevices are -shutdown and an admin has to repair the system. -</p><p> -If the boot was successfull, the current snapshot is marked as known to be -working. -</p><p>Plugins are used for performing the tests and new plugins can be -written. They are stored in the -<code class="filename">/usr/lib/health-checker</code> directory and executed either -with the option <span class="command"><strong>check</strong></span> or <span class="command"><strong>stop</strong></span>. -If called with "check", the plugin should verify that the service works and -return 0, else 1. If one plugin returns "1", <span class="command"><strong>health-check</strong></span> -will evaluate what to do. If neither a rollback or reboot is usefull, all -plugins will be called with the "stop" option. In this case, the plugins + checks during boot, if the system is coming up correct. + In error case, the action depends on what did happen before. If this is the + first boot after a transactional update, an automatic rollback to the last + known working snapshot is made. If the snapshot was already rebooted + successfull before, a reboot is tried. If this does not help, some sevices + are shutdown and an admin has to repair the system. + </p><p> + If the boot was successfull, the current snapshot is marked as known to be + working. + </p><p>Plugins are used for performing the tests and new plugins can be + written. They are stored in the + <code class="filename">/usr/lib/health-checker</code> directory and executed either + with the option <span class="command"><strong>check</strong></span> or <span class="command"><strong>stop</strong></span>. + If called with "check", the plugin should verify that the service works and + return 0, else 1. If one plugin returns "1", <span class="command"><strong>health-check</strong></span> + will evaluate what to do. If neither a rollback or reboot is usefull, all + plugins will be called with the "stop" option. In this case, the plugins should shutdown the services are far as possible and usefull. -</p></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="transactional-update.8.html"><span class="citerefentry"><span class="refentrytitle">transactional-update</span>(8)</span></a> -</p></div></div></body></html> + </p></div><div class="refsect1"><a name="telemetry"></a><h2 id="TELEMETRY">TELEMETRY<a class="headerlink" title="Permalink to this headline" href="#TELEMETRY">¶</a></h2><p> + If <a href="telem-record-gen.1.html"><span class="citerefentry"><span class="refentrytitle">telem-record-gen</span>(1)</span></a> + is installed telemetry events are created additional to logging with + <a href="syslog.3.html"><span class="citerefentry"><span class="refentrytitle">syslog</span>(3)</span></a>. + </p></div><div class="refsect1"><a name="see_also"></a><h2 id="SEE ALSO">SEE ALSO<a class="headerlink" title="Permalink to this headline" href="#SEE%20ALSO">¶</a></h2><p><a href="transactional-update.8.html"><span class="citerefentry"><span class="refentrytitle">transactional-update</span>(8)</span></a> + </p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/plugins/Makefile.in new/health-checker-1.2/plugins/Makefile.in --- old/health-checker-1.1/plugins/Makefile.in 2019-02-04 11:07:44.000000000 +0100 +++ new/health-checker-1.2/plugins/Makefile.in 2019-02-27 15:13:47.000000000 +0100 @@ -250,9 +250,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/Makefile + $(AUTOMAKE) --foreign plugins/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/sbin/Makefile.in new/health-checker-1.2/sbin/Makefile.in --- old/health-checker-1.1/sbin/Makefile.in 2019-02-04 10:55:19.000000000 +0100 +++ new/health-checker-1.2/sbin/Makefile.in 2019-02-27 15:13:47.000000000 +0100 @@ -247,9 +247,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sbin/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign sbin/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu sbin/Makefile + $(AUTOMAKE) --foreign sbin/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/sbin/health-checker.in new/health-checker-1.2/sbin/health-checker.in --- old/health-checker-1.1/sbin/health-checker.in 2019-02-04 10:23:51.000000000 +0100 +++ new/health-checker-1.2/sbin/health-checker.in 2019-02-25 21:39:27.000000000 +0100 @@ -13,6 +13,8 @@ STATE_FILE=/var/lib/misc/health-check.state REBOOTED_STATE=/var/lib/misc/health-check.rebooted PLUGINDIR=@PLUGINDIR@ +TELEM_SEVERITY=1 +TELEM_PAYLOAD="" BTRFS_ID=0 @@ -21,6 +23,49 @@ BTRFS_ID=`btrfs subvolume get-default / | awk '{print $2}'` } +create_log() +{ + local SEVERITY=1 + + logger -s -p $1 $2 + + # Create severity and payload for telemetrics if available + case $1 in + user.emerg) + SEVERITY=4 + ;; + user.crit) + SEVERITY=3 + ;; + user.alert) + SEVERITY=2 + ;; + *) + SEVERITY=1 + ;; + esac + + if [ $SEVERITY -gt $TELEM_SEVERITY ]; then + TELEM_SEVERITY=$SEVERITY + fi + if [ -z "${TELEM_PAYLOAD}" ]; then + TELEM_PAYLOAD=$2 + else + TELEM_PAYLOAD="${TELEM_PAYLOAD}\n$2" + fi +} + +telem_send_record() +{ + # Log via telemetrics if available + if [ -x /usr/bin/telem-record-gen ]; then + echo -e "${TELEM_PAYLOAD}" | /usr/bin/telem-record-gen -s $TELEM_SEVERITY -c "org.opensuse/health/boot" + # Communiction is async, give daemon time to send data + # before we reboot + test "$1" = "1" && sleep 2 + fi +} + save_working_snapshot() { set_btrfs_id @@ -33,7 +78,8 @@ . ${STATE_FILE} btrfs subvolume set-default ${LAST_WORKING_BTRFS_ID} /.snapshots if [ $? -ne 0 ]; then - logger -s -p user.crit "ERROR: btrfs set-default $BTRFS_ID failed!" + create_log user.crit "ERROR: btrfs set-default $BTRFS_ID failed!" + telem_send_playload 1 exit 1 fi } @@ -42,7 +88,7 @@ { # stop all services for script in ${PLUGINDIR}/* ; do - ${script} stop + ${script} stop done } @@ -50,7 +96,7 @@ { if [ ! -f ${STATE_FILE} ]; then # No state file, no successfull boot - logger -s -p user.emerg "Machine didn't come up correct, stop services" + create_log user.emerg "Machine didn't come up correct, stop services" stop_services return fi @@ -60,17 +106,19 @@ set_btrfs_id if [ ${LAST_WORKING_BTRFS_ID} -ne ${BTRFS_ID} ]; then - logger -s -p user.alert "Machine didn't come up correct, do a rollback" + create_log user.alert "Machine didn't come up correct, do a rollback" rollback if [ $? -eq 0 ]; then + telem_send_record 1 systemctl reboot fi elif [ ! -f ${REBOOTED_STATE} ]; then - logger -s -p user.crit "Machine didn't come up correct, try a reboot" + create_log user.crit "Machine didn't come up correct, try a reboot" echo `date "+%Y-%m-%d %H:%M"` > ${REBOOTED_STATE} + telem_send_record 1 systemctl reboot else - logger -s -p user.emerg "Machine didn't come up correct, stop services" + create_log user.emerg "Machine didn't come up correct, stop services" stop_services fi } @@ -84,7 +132,7 @@ for script in ${PLUGINDIR}/* ; do ${script} check if [ $? -ne 0 ]; then - logger -s -p user.crit "ERROR: \"${script} check\" failed" + create_log user.crit "ERROR: \"${script} check\" failed" FAILED=1 fi done @@ -92,12 +140,17 @@ if [ ${FAILED} -ne 0 ]; then echo "Health check failed!" error_decission + telem_send_record 0 exit 1 else echo "Health check passed" # Save good working state and remove old rebooted state file save_working_snapshot - rm -rf ${REBOOTED_STATE} + if [ -f ${REBOOTED_STATE} ]; then + create_log user.info "Health check passed after reboot" + rm -rf ${REBOOTED_STATE} + fi fi +telem_send_record 0 exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/health-checker-1.1/systemd/Makefile.in new/health-checker-1.2/systemd/Makefile.in --- old/health-checker-1.1/systemd/Makefile.in 2019-02-04 10:55:19.000000000 +0100 +++ new/health-checker-1.2/systemd/Makefile.in 2019-02-27 15:13:47.000000000 +0100 @@ -248,9 +248,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemd/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign systemd/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu systemd/Makefile + $(AUTOMAKE) --foreign systemd/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \