Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from upstream repository #226

Merged
merged 8 commits into from Dec 12, 2023
Merged

Update from upstream repository #226

merged 8 commits into from Dec 12, 2023

Conversation

periklis
Copy link

@periklis periklis commented Dec 12, 2023

Refs:

grafanabot and others added 8 commits December 12, 2023 09:52
…r) (#11442)

**Here is a summary of the updates contained in this PR:**
***
Update attribute `$.appVersion` in yaml file
`./production/helm/loki/Chart.yaml` to the following value: `2.9.3`
***
Bump version of Helm Chart
Add changelog entry to `./production/helm/loki/CHANGELOG.md`
Re-generate docs

Co-authored-by: Trevor Whitney <trevorjwhitney@gmail.com>
…11363)

**What this PR does / why we need it**:
Currently, `Fetch` method of memcached is not truely respecting the
`ctx` passed to it. It get lost in `fetchKeysBatched` method

https://github.com/grafana/loki/blob/489ac8d529ec39352/pkg/storage/chunk/cache/memcached.go#L171-L226

So even if client cancels the context, memcached would still be fetching
keys.

This PR make it respect context cancelation.

Changes:
1. Add select case to check for `ctx.Done()` before submitting work to
`inputCh`.
2. Given, now we have two exit point to stop the mecached actor one via
old `Stop()` method and other via context cancel, I Added aditional flag
`stopped` to make sure we are not closing channels that are already
closed.
3. Updated tests to lock this behaviour.

**Which issue(s) this PR fixes**:
Fixes NA

**Special notes for your reviewer**:
This bug played a role in some incident recently on our Loki SaaS. cc
@slim-bean

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [x] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label

---------

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
Bloom blocks in the wild likely exceed the memory resources of a
compactor. Therefore we need to make sure that we don't copy block data
into memory, but rather write to and read from disk.

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Co-authored-by: Paul Rogers <paul.rogers@grafana.com>
PR #9031 from @Alex3k has gone quite stale as the topic has been revised
since it was submitted.

This PR attempts to get at least part of Alex's update into the
documentation so that we can close his original PR.
**What this PR does / why we need it**:
Replaces @Alex3k PR #9058 which has gone quite stale (file has moved,
new content has been added).

Adds a mini table of contents at the beginning of the page with links to
headings.
Rearranges the headings so that they are in alphabetical order.

**Special notes for your reviewer**:
Content below line 27 is unchanged and previously published, it has only
been moved in the file.
…11434)

**What this PR does / why we need it**:

Add missing topologySpreadConstraints for the read deployment component.
Must have been missed in this
[PR](#11086)

Helm diff:

```console
helm diff upgrade loki ./loki -f ~/values-test.yaml -n logging --allow-unreleased
logging, loki-read, Deployment (apps) has changed:
  # Source: loki/templates/read/deployment-read.yaml
  apiVersion: apps/v1
  kind: Deployment
  .......
+       topologySpreadConstraints:
+         - labelSelector:
+             matchLabels:
+               app.kubernetes.io/component: read
+               app.kubernetes.io/instance: loki
+               app.kubernetes.io/name: loki
+           maxSkew: 1
+           nodeAffinityPolicy: Honor
+           nodeTaintsPolicy: Honor
+           topologyKey: topology.kubernetes.io/zone
+           whenUnsatisfiable: ScheduleAnyway
```

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [ ] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [x] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)

---------

Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
**What this PR does / why we need it**:

**Which issue(s) this PR fixes**:
Final PR to complete fixes #9228 

**Special notes for your reviewer**:
Updates Getting Started topic to be a general overview, links to Grafana
topics, and Agent configuration file.
Adds new Quick Start topic for running Loki Docker compose file locally
that includes working sample queries.
Adds three new graphics
Removes two unused graphics
@periklis periklis self-assigned this Dec 12, 2023
Copy link

openshift-ci bot commented Dec 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: periklis

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 12, 2023
Copy link

openshift-ci bot commented Dec 12, 2023

@periklis: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@periklis periklis merged commit c5d4d84 into openshift:main Dec 12, 2023
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants