~vultaire/charm-hw-health:lp1904032

Branch merges

Propose for merging

Merged into charm-hw-health:master at revision 3440d39bee739e85704820caf571de8949f061cb

James Troup (community): Approve on 2020-11-16

Diff: 7540 lines (+7435/-7)

5 files modified

src/lib/hwhealth/discovery/lshw.py (+16/-4)
src/tests/expected/lshw.py (+610/-0)
src/tests/hw-health-samples/lshw-focal.dell.01.json (+6774/-0)
src/tests/unit/test_hwdiscovery.py (+5/-1)
src/tests/unit/test_lshw.py (+30/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

3440d39... by Paul Goins on 2020-11-16

LP#1904032: Fix "lshw -json" parsing on Focal

In Bionic, "lshw -json" output one dictionary per item it was
displaying. In the case of multiple items (e.g. "-class network" with
multiple adapters), it would output multiple dictionaries in sequence.

In Focal, "lshw -json" outputs records in a list, which is more
correct for JSON parsers, however it breaks our current parsing.

The fix is simply to grab the first item in the list and act upon it.
Since the "lshw -json" query outputs the system record by default,
there will only be one item for our case.

278e94a... by Alvaro Uria on 2020-11-13

Merge branch 'bug/1904045'

Reviewed-on: https://code.launchpad.net/~canonical-is-bootstack/charm-hw-health/+git/charm-hw-health/+merge/393712
Reviewed-by: James Troup <email address hidden>

ee9ba76... by Alvaro Uria on 2020-11-13

LP#1904045: Fix ipmi cronjob runas permissions

When the ipmi cronjob is configured, the nagios user will run the croned
script. However, the configuration of the nrpe check reconfigured the
cronjob to be run as root. This fix makes the cronjob be always run by
the nagios user.

1ca277c... by Alvaro Uria on 2020-11-06

Merge branch 'aluria/bug/1893461'

Reviewed-on: https://code.launchpad.net/~canonical-is-bootstack/charm-hw-health/+git/charm-hw-health/+merge/393454
Reviewed-by: Paul Goins <email address hidden>
Reviewed-by: Alvaro Uria <email address hidden>

2e7f1c2... by Facundo Ciccioli on 2020-09-15

Add support for a whole family of controllers (MegaRAID SAS ones)

This is instead of listing every product that can be controlled by
megacli, encompass them by the driver.

d7bc020... by Alvaro Uria on 2020-10-20

Merge branch 'blacken-20.10'

Reviewed-on: https://code.launchpad.net/~canonical-is-bootstack/charm-hw-health/+git/charm-hw-health/+merge/392535
Reviewed-by: Drew Freiberger <email address hidden>

3781709... by Alvaro Uria on 2020-10-19

Fix linting via black

b1caca2... by Facundo Ciccioli on 2020-09-21

As it was, the ifeq was always going to evaluate to false

The use of wildcard is mandatory to produce the desired effect of
checking the existance of a file.

27fac68... by Xav Paice on 2020-08-13

Merge branch 'remove-check-ilorest.py'

cc1f497... by Drew Freiberger on 2020-08-12

Remove extraneous debug print from test_cron_ilorest.py unit test.