updating grafana repository to use stretch builds

[mues-lee]

Signed-off-by: Marcus Krüger [email protected] (github: mues-lee)

[EliasGabrielsson]

What do you think about this? #367
More job yes but longterm stability will be better.

[mues-lee]

@EliasGabrielsson please review the changes, hope this was what you meant in #367

[ThomDietrich]

Is this routine safe?
Are repository branches available for jessie, stretch, trusty, xenial, ...?

[BClark09]

The influxdata repo contains the major ones. However, the script will fail for Ubuntu users because Grafana only contains jessie, stretch and wheezy.

Grafana recommend in the docs using Jessie regardless of distro used.

[mues-lee]

it's true the docs on grafana still recommend using jessie, but i think this page is just outdated, of course i don't have any prove of my thinking

about ubuntu, yes it would fail for them, but as i understood the function, it was never meant to work on ubuntu, since there wasn't a distinguish between debian and ubuntu at all
sure this can be added, but i believe a central platform recognition would be much better then doing this in each function

[EliasGabrielsson]

Don't have an answer to this but which of these two could we use?
https://repos.influxdata.com/debian/dists/* or https://repos.influxdata.com/ubuntu/dists/*

Both seams to have all major releases for both Ubuntu and Debian.

[EliasGabrielsson]

Maybe just do an if case for the Ubuntu case and use them both.

[EliasGabrielsson]

According to this article I would say the routine lsb-release is stable.
https://www.unixtutorial.org/commands/lsb_release/

[EliasGabrielsson]

Stretch seams to be deploy and used as deb (grafana/grafana#8648) but the ubuntu releases is not available as @BClark09 mention. Some clever filtering is needed here, like a fallback for Ubuntu.

[EliasGabrielsson]

@mues-lee Great changes. Made two comments in the code which sums up reasoning in this thread. When they are solved I would say this is ready for merge.

[mues-lee]

@EliasGabrielsson please review my recent changes

[EliasGabrielsson]

Correct me if I am wrong but isn't something like this what we are after as there are no ubuntu packages available?

if [ $codename = "jessie" ]; then
    echo "deb https://packagecloud.io/grafana/stable/debian/ jessie main" > /etc/apt/sources.list.d/grafana.list || FAILED=2
else
    echo "deb https://packagecloud.io/grafana/stable/debian/ stretch main" > /etc/apt/sources.list.d/grafana.list || FAILED=2
fi

[EliasGabrielsson]

Have not tested above code, could contain syntax error etc.

[mues-lee]

well this is what my changes do, with the added benefit that once when there will be the packages for Ubuntu will be there, the if loop can be removed and we end up with a cleaner code with less points to adjust when a new supported stable release from, let's say from debian, is released.

But of course we can do it now withe the if-else loop, this should not be my decision

[EliasGabrielsson]

But doesn't we end up with an invalid entry in sources.list for Ubuntu then which we can't resolve?
Eg. "deb https://packagecloud.io/grafana/stable/ubuntu/ xenial main" will produces sources can't be found.

[mues-lee]

well no ... line 421 would insert deb https://packagecloud.io/grafana/stable/ubuntu/ xenial main but than it will be overwritten by the if loop with deb https://packagecloud.io/grafana/stable/debian/ jessie main
i have planed this for the future, when there maybe will be ubuntu packages for grafana, then we can just remove the if loop and we will be done

[EliasGabrielsson]

@mues-lee Thanks for your patience when in reviewing this.
Now we will have correct packages with for all OS:es. 🥁🥁🥁

[mues-lee]

@EliasGabrielsson you are welcome

[ThomDietrich]

Hey guys! I'm a bit late to the game but this looks good to me.

In general I'd say it's preferable to use the helper methods over in https://github.com/openhab/openhabian/blob/master/functions/helpers.sh
As you know there will always be this one case where one of those checks needs to be adapted (see #374). Hence instead of your special check I'd have prefered a simple if is_ubuntu ....

Just my two cents.

[mues-lee]

that is correct, hadn't think about this, but it would be know problem to exchange my special checks, just let me know if i should do this

[ThomDietrich]

If I remember correctly you wanted to add the additional configuration steps as described in the tutorial. If this is the case, just do it while at that ;)

[mues-lee]

not sure about which

additional configuration steps as described in the tutorial

you mean

[ThomDietrich]

#366