salt: Do not longer remove Loki service instance post-upgrade

[TeddyAndrieux]

Fix a bug that deletes the Loki service instance post-upgrade when it
shouldn't.

This Loki service instance and grafana datasources are deployed to
mitigate a Loki limitation when working with multi instances

See: abc293a
See: #3681

NOTE: We also fix the test about Loki instance service

[bert-e]

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

[bert-e]

Integration data created

I have created the integration data for the additional destination branches.

• this pull request will merge bugfix/do-not-remove-extra-loki-services-post-upgrade into
  development/2.11
• w/123.0/bugfix/do-not-remove-extra-loki-services-post-upgrade will be merged into development/123.0

The following branches will NOT be impacted:

• development/2.0
• development/2.1
• development/2.10
• development/2.2
• development/2.3
• development/2.4
• development/2.5
• development/2.6
• development/2.7
• development/2.8
• development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

[bert-e]

Waiting for approval

The following approvals are needed before I can proceed with the merge:

• the author

• one peer

Peer approvals must include at least 1 approval from the following list:

• @ChengYanJin

• @lucieleonard

• @JBWatenbergScality

• @alexandre-allard-scality

• @gdemonet

• @TeddyAndrieux

• @NicolasT

• @thomasdanan

[bert-e]

History mismatch

Merge commit #6537d4645e5b909c8a1637fbb1eb1a4698fa79d7 on the integration branch
w/123.0/bugfix/do-not-remove-extra-loki-services-post-upgrade is merging a branch which is neither the current
branch bugfix/do-not-remove-extra-loki-services-post-upgrade nor the development branch
development/123.0.

It is likely due to a rebase of the branch bugfix/do-not-remove-extra-loki-services-post-upgrade and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

[TeddyAndrieux]

/reset

[bert-e]

Reset complete

I have successfully deleted this pull request's integration branches.

[bert-e]

Integration data created

I have created the integration data for the additional destination branches.

• this pull request will merge bugfix/do-not-remove-extra-loki-services-post-upgrade into
  development/2.11
• w/123.0/bugfix/do-not-remove-extra-loki-services-post-upgrade will be merged into development/123.0

The following branches will NOT be impacted:

• development/2.0
• development/2.1
• development/2.10
• development/2.2
• development/2.3
• development/2.4
• development/2.5
• development/2.6
• development/2.7
• development/2.8
• development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

[bert-e]

Waiting for approval

The following approvals are needed before I can proceed with the merge:

• the author

• one peer

Peer approvals must include at least 1 approval from the following list:

• @ChengYanJin

• @lucieleonard

• @JBWatenbergScality

• @alexandre-allard-scality

• @gdemonet

• @TeddyAndrieux

• @NicolasT

• @thomasdanan

[TeddyAndrieux]

/approve

[bert-e]

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

• ✔️ development/2.11

• ✔️ development/123.0

The following branches will NOT be impacted:

• development/2.0
• development/2.1
• development/2.10
• development/2.2
• development/2.3
• development/2.4
• development/2.5
• development/2.6
• development/2.7
• development/2.8
• development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

• Any commit you add on the source branch will trigger a new cycle after the
  current queue is merged.
• Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

[bert-e]

I have successfully merged the changeset of this pull request
into targetted development branches:

• ✔️ development/2.11

• ✔️ development/123.0

The following branches have NOT changed:

• development/2.0
• development/2.1
• development/2.10
• development/2.2
• development/2.3
• development/2.4
• development/2.5
• development/2.6
• development/2.7
• development/2.8
• development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.