2. Open the config file in the text editor of your choice. It should look similar to this:
1. Open the config file in the text editor of your choice. It should look similar to this:
```
server:
@ -42,7 +42,7 @@ scrape_configs:
The seven lines under `scrape_configs` are what send the logs that Loki generates to Loki, which then outputs them in the command line and http://localhost:3100/metrics.
3. Copy the seven lines under `scrape_configs`, and then paste them under the original job (you can also just edit the original seven lines).
1. Copy the seven lines under `scrape_configs`, and then paste them under the original job (you can also just edit the original seven lines).
Below is an example that sends logs from a default Grafana installation to Loki. We updated the following fields:
- job_name - This differentiates the logs collected from other log groups.
@ -20,9 +20,9 @@ page](https://github.com/settings/keys). If the GPG key for the email address
used to commit with Loki is not present, follow these instructions to add it:
1. Run `gpg --armor --export <your email address>`
2. Copy the output.
3. In the settings page linked above, click "New GPG Key".
4. Copy and paste the PGP public key block.
1. Copy the output.
1. In the settings page linked above, click "New GPG Key".
1. Copy and paste the PGP public key block.
#### Signing Commits and Tags by Default
@ -50,22 +50,22 @@ export GPG_TTY=$(tty)
1. Create a new branch to update `CHANGELOG.md` and references to version
numbers across the entire repository (e.g. README.md in the project root).
2. Modify `CHANGELOG.md` with the new version number and its release date.
3. List all the merged PRs since the previous release. This command is helpful
1. Modify `CHANGELOG.md` with the new version number and its release date.
1. List all the merged PRs since the previous release. This command is helpful
for generating the list (modifying the date to the date of the previous release): `curl https://api.github.com/search/issues?q=repo:grafana/loki+is:pr+"merged:>=2019-08-02" | jq -r ' .items[] | "* [" + (.number|tostring) + "](" + .html_url + ") **" + .user.login + "**: " + .title'`
4. Go through `docs/` and find references to the previous release version and
1. Go through `docs/` and find references to the previous release version and
update them to reference the new version.
5. *Without creating a tag*, create a commit based on your changes and open a PR
1. *Without creating a tag*, create a commit based on your changes and open a PR
for updating the release notes.
1. Until [852](https://github.com/grafana/loki/issues/852) is fixed, updating
Helm and Ksonnet configs needs to be done in a separate commit following
the release tag so that Helm tests pass.
6. Merge the changelog PR.
7. Create a new tag for the release.
1. Merge the changelog PR.
1. Create a new tag for the release.
1. Once this step is done, the CI will be triggered to create release
artifacts and publish them to a draft release. The tag will be made
publicly available immediately.
2. Run the following to create the tag:
1. Run the following to create the tag:
```bash
RELEASE=v1.2.3 # UPDATE ME to reference new release
@ -74,7 +74,7 @@ export GPG_TTY=$(tty)
git tag -s $RELEASE -m "tagging release $RELEASE"
git push origin $RELEASE
```
8. Watch CircleCI and wait for all the jobs to finish running.
1. Watch CircleCI and wait for all the jobs to finish running.
## Updating Helm and Ksonnet configs
@ -82,10 +82,10 @@ These steps should be executed after the previous section, once CircleCI has
finished running all the release jobs.
1. Run `bash ./tools/release_prepare.sh`
2. When prompted for the release version, enter the latest tag.
3. When prompted for new Helm version numbers, the defaults should suffice (a
1. When prompted for the release version, enter the latest tag.
1. When prompted for new Helm version numbers, the defaults should suffice (a
minor version bump).
4. Commit the changes to a new branch, push, make a PR, and get it merged.
1. Commit the changes to a new branch, push, make a PR, and get it merged.
## Publishing the Release Draft
@ -93,9 +93,9 @@ Once the previous two steps are completed, you can publish your draft!
1. Go to the [GitHub releases page](https://github.com/grafana/loki/releases)
and find the drafted release.
2. Edit the drafted release, copying and pasting *notable changes* from the
1. Edit the drafted release, copying and pasting *notable changes* from the
CHANGELOG. Add a link to the CHANGELOG, noting that the full list of changes
can be found there. Refer to other releases for help with formatting this.
3. Optionally, have other team members review the release draft so you feel
1. Optionally, have other team members review the release draft so you feel
San Nguyen
5 years ago
committed by