diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 28cbda5ab9af..20b3773b13cd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,96 +1,60 @@ -# Contributing +# Contributing to Grafana -Grafana uses GitHub to manage contributions. Contributions take the form of pull requests that will be reviewed by the core team. +Thank you for your interest in contributing to Grafana! We welcome all people who want to contribute in a healthy and constructive manner within our community. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](CODE_OF_CONDUCT.md). -- If you are a new contributor, see [Steps to contribute](#steps-to-contribute). +This document is a guide to help you through the process of contributing to Grafana. -- If you have a trivial fix or improvement, go ahead and create a pull request. +## Become a contributor -- If you plan to do something more involved, then discuss your idea on the respective [issue](https://github.com/grafana/grafana/issues) or create a [new issue](https://github.com/grafana/grafana/issues/new) if one does not exist. This helps avoid unnecessary work and gives you and us a good deal of inspiration. +You can contribute to Grafana in several ways. Here are some examples: -- Sign our [CLA](http://docs.grafana.org/contribute/cla/). +- Contribute to the Grafana codebase. +- Report and triage bugs. +- Develop community plugins and dashboards. +- Write technical documentation and blog posts, for users and contributors. +- Organize meetups and user groups in your local area. +- Help others by answering questions about Grafana. -- Follow the code style guides: - - [Backend style guide](https://github.com/grafana/grafana/tree/master/pkg) - - [Frontend style guide](https://github.com/grafana/grafana/tree/master/style_guides) +For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/). -## Steps to contribute +### Report bugs -Should you wish to work on a GitHub issue, check first if it is not already assigned to someone. If it is free, you claim it by commenting on the issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue. +Report a bug by submitting a [bug report](https://github.com/grafana/grafana/issues/new?labels=type%3A+bug&template=1-bug_report.md). Make sure that you provide as much information as possible on how to reproduce the bug. -Please check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) and [`help wanted`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) labels to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the core team or the original poster will clarify it. +Before submitting a new issue, try to make sure someone hasn't already reported the problem. Look through the [existing issues](https://github.com/grafana/grafana/issues) for similar issues. -To set up a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/). +#### Security issues -## Pull request checklist +If you believe you've found a security vulnerability, please read our [security policy](https://github.com/grafana/grafana/security/policy) for more details. -Whether you are contributing or doing code review, first read and understand https://google.github.io/eng-practices/review/reviewer/ for general engineering practices around code reviews that we also use. +### Suggest enhancements -- Branch from the master branch and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master, then you might be asked to rebase your changes. +If you have an idea of how to improve Grafana, submit an [enhancement request](https://github.com/grafana/grafana/issues/new?labels=type%3A+feature+request&template=2-feature_request.md). -- If your patch is not getting reviewed or you need a specific person to review it, then you can @-reply a reviewer asking for a review in the pull request or a comment. +### Your first contribution -- Add tests relevant to the fixed bug or new feature. +Unsure where to begin contributing to Grafana? Start by browsing issues labeled `beginner friendly` or `help wanted`. -### High-level checks +- [Beginner-friendly](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) issues are generally straightforward to complete. +- [Help wanted](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) issues are problems we would like the community to help us with regardless of complexity. -- [ ] The pull request adds value and the impact of the change is in line with the [Backend style guide](https://github.com/grafana/grafana/tree/master/pkg) or [Frontend style guide](https://github.com/grafana/grafana/tree/master/style_guides). -- [ ] The pull request works the way it says it should do. -- [ ] The pull request closes one issue if possible and does not fix unrelated issues within the same pull request. -- [ ] The pull request contains necessary tests. +If you're looking to make a code change, see how to set up your environment for [local development](contribute/development.md). -### Low-level checks +When you're ready to contribute, it's time to [Create a pull request](/contribute/pull-request.md). -- [ ] The pull request contains a title that explains it. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message). -- [ ] The pull request contains necessary links to issues. -- [ ] The pull request contains commits with messages that are small and understandable. It follows [PR and commit messages guidelines](#Pull-Requests-titles-and-message). -- [ ] The pull request does not contain magic strings or numbers that could be replaced with an `Enum` or `const` instead. +#### Contributor License Agreement (CLA) -#### Bug-specific checks +Before we can accept your pull request, you need to [sign our CLA](https://grafana.com/docs/contribute/cla/). If you haven't, our CLA assistant prompts you to when you create your pull request. -- [ ] The pull request contains `Closes: #Issue` or `Fixes: #Issue` in pull request description. -- [ ] The Pull Request adds tests that replicate the fixed bug and helps avoid regressions. +## Community -### Frontend-specific checks +- Follow [@grafana on Twitter](https://twitter.com/grafana/) +- Read and subscribe to the [Grafana blog](https://grafana.com/blog/) +- If you have a specific question, check out our [discussion forums](https://community.grafana.com). +- For general discussions, join us on the [official Slack](http://slack.raintank.io/). -- [ ] The pull request does not increase the Angular code base. - > We are in the process of migrating to React so any increment of Angular code is generally discouraged. -- [ ] The pull request does not contain uses of `any` or `{}` without comments describing why. -- [ ] The pull request does not contain large React components that could easily be split into several smaller components. -- [ ] The pull request does not contain back end calls directly from components, use actions and Redux instead. -- [ ] The pull request follows our [styling with Emotion convention](./style_guides/styling.md) - > We still use a lot of SASS, but any new CSS work should be using or migrating existing code to Emotion +## Where do I go from here? -#### Redux specific checks (skip if your pull request does not contain Redux changes) - -- [ ] The pull request does not contain code that mutates state in reducers or thunks. -- [ ] The pull request uses helpers `actionCreatorFactory` and `reducerFactory` instead of traditional `switch statement` reducers in Redux. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details. -- [ ] The pull request uses `reducerTester` to test reducers. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details. -- [ ] The pull request does not contain code that accesses the reducers state slice directly, instead, the code uses state selectors to access state. - -### Pull request titles and message - -Pull request titles should follow this format: `Area: Name of the change`. Titles are used to generate the changelog so they should be as descriptive as possible in one line. - -Good examples: - -- `Explore: Adds Live option for supported data sources` -- `GraphPanel: Don't sort series when legend table & sort column is not visible` -- `Build: Support publishing MSI to grafana.com` - -The message in the pull requests should contain a reference so the issue if there is one. For example, `Closes #`, `Fixes #`, or `Ref #` if the change is related to an issue but does not close it. Make sure to explain what problem the pull request is solving and why its implemented this way. As a new contributor its often better to overcommunicate to avoid back-and-forth communication, as it consumes time and energy. - -### Git commit formatting - -Grafana Squash Pull requests when merging them into master. This means the maintainer will be responsible for the title in the git commit message. -The commit message of the commits in the Pull Request can still be part of the git commit body. So it's always encouraged to write informative commit messages. - -The Git commit title should be short, descriptive and include the Pull Request ID. - -Good examples: - -- `Explore: Live supprt in data sources (#12345)` -- `GraphPanel: Fix legend sorting issues (#12345)` -- `Build: Support publishing MSI to grafana.com (#12345)` - -Its also good practice to include a reference to the issue in the Git commit body when possible. +- Set up your [development environment](contribute/development.md). +- Learn how to [contribute documentation](contribute/documentation.md). +- Get started [developing plugins](https://grafana.com/docs/plugins/developing/development/) for Grafana. diff --git a/docs/sources/contribute/development/developing-on-macos.md b/contribute/development.md similarity index 73% rename from docs/sources/contribute/development/developing-on-macos.md rename to contribute/development.md index a6fccabf8b7e..66ecdc537a05 100644 --- a/docs/sources/contribute/development/developing-on-macos.md +++ b/contribute/development.md @@ -1,15 +1,6 @@ -+++ -title = "Developing on macOS" -description = "Developing on macOS" -type = "docs" -[menu.docs] -parent = "development" -weight = 1 -+++ +# Develop Grafana -# Developing on macOS - -This guide helps you get started developing Grafana on macOS. +This guide helps you get started developing Grafana. ## Dependencies @@ -20,6 +11,8 @@ Make sure you have the following dependencies installed before moving on to set - [Node.js (Long Term Support)](https://nodejs.org) - [Yarn](https://yarnpkg.com) +### macOS + We recommend using [Homebrew](https://brew.sh/) for installing any missing dependencies: ``` @@ -50,7 +43,7 @@ Before we can build the frontend assets, we need to install the dependencies: yarn install --pure-lockfile ``` -When this is done, we can start building our source code: +After the command has finished, we can start building our source code: ``` yarn start @@ -64,19 +57,19 @@ Next, we'll build the web server that will serve the frontend assets we just bui Build and run the backend, by running `make run` in the root directory of the repository. This command will compile the Go source code, and start a web server. -By default, the web server will be served at `http://localhost:3000/`. +By default, you can access the web server at `http://localhost:3000/`. Log in using the default credentials: | username | password | -|----------|----------| -| `admin` | `admin` | +| -------- | -------- | +| `admin` | `admin` | -When you log in for the first time, you'll be asked to change your password. +When you log in for the first time, Grafana will ask you to change your password. ## Test Grafana -The tests for the frontend are written using [jest](https://jestjs.io/). Run them using yarn: +We use [jest](https://jestjs.io/) for our frontend tests. Run them using yarn: ``` yarn jest @@ -90,7 +83,7 @@ go test -v ./pkg/... ## Add data sources -By now, you should be able to build and test a change you've made to the Grafana source code. Most likely though, you're going to need to add a few data sources to verify the change you made. +By now, you should be able to build and test a change you've made to the Grafana source code. In most cases, you need to add at least one data source to verify the change. To set up data sources for your development environment, go to the `devenv` directory in the Grafana repository: @@ -98,7 +91,7 @@ To set up data sources for your development environment, go to the `devenv` dire cd devenv ``` -Run the `setup.sh` script to setup a set of data sources and dashboards in your local Grafana. Data sources are named **gdev-\**, and dashboards are located in a folder called **gdev dashboards**. +Run the `setup.sh` script to setup a set of data sources and dashboards in your local Grafana. The script creates a set of data sources called **gdev-\**, and a set of dashboards located in a folder called **gdev dashboards**. Some of the data sources require databases to run in the background. @@ -116,4 +109,6 @@ See the repository for all the [available data sources](https://github.com/grafa ## Learn more -- [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova). +- Read our [style guides](/contribute/style-guides). +- Learn how to [Create a pull request](/contribute/pull-request.md). +- Read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova). diff --git a/docs/sources/contribute/documentation.md b/contribute/documentation.md similarity index 81% rename from docs/sources/contribute/documentation.md rename to contribute/documentation.md index 391d996da4ec..63f3de50e548 100644 --- a/docs/sources/contribute/documentation.md +++ b/contribute/documentation.md @@ -1,15 +1,8 @@ -+++ -title = "Documentation" -description = "Contributing to documentation" -type = "docs" -[menu.docs] -parent = "contribute" -weight = 2 -+++ - # Contributing to documentation -## How do I contribute? +This documents guides you through the process of contributing to the Grafana documentation. Make sure you've read the guide for [Contributing to Grafana](/CONTRIBUTING.md). + +## Your first contribution If you’re unsure about where to start, check out some of our [open docs issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3Atype%2Fdocs). @@ -19,20 +12,18 @@ When you’ve found an issue you want to work on, you’re encouraged to comment If you encounter any misspellings, or violations to the style guide, please let us know by submitting an issue. -On every page in the documentation there are two links: +On every page in the [documentation](https://grafana.com/docs/) there are two links: -- __Edit this page__ takes you directly to the file on GitHub where you can contribute a fix. -- __Request doc changes__ prepares an issue on GitHub with relevant information already filled in. +- **Edit this page** takes you directly to the file on GitHub where you can contribute a fix. +- **Request doc changes** prepares an issue on GitHub with relevant information already filled in. ## Community -If you have questions on a specific issue, post a comment to ask for clarification, or to give feedback. - For general discussions on documentation, you’re welcome to join the `#docs` channel on our [public Grafana Slack](http://slack.raintank.io) team. ## Guidelines -All Grafana documentation is written using [Markdown](https://en.wikipedia.org/wiki/Markdown), and can be found in the [docs](https://github.com/grafana/grafana/tree/master/docs) directory in the [Grafana GitHub repository](https://github.com/grafana/grafana). The [documentation website](https://grafana.com/docs) is generated with [hugo](https://gohugo.io) which uses [Blackfriday](https://github.com/russross/blackfriday) as its Markdown rendering engine. +All Grafana documentation is written using [Markdown](https://en.wikipedia.org/wiki/Markdown), and can be found in the [docs](https://github.com/grafana/grafana/tree/master/docs) directory in the [Grafana GitHub repository](https://github.com/grafana/grafana). The [documentation website](https://grafana.com/docs) is generated with [Hugo](https://gohugo.io) which uses [Blackfriday](https://github.com/russross/blackfriday) as its Markdown rendering engine. ### Structure diff --git a/contribute/pull-request.md b/contribute/pull-request.md new file mode 100644 index 000000000000..14f3bfd1bc31 --- /dev/null +++ b/contribute/pull-request.md @@ -0,0 +1,94 @@ +# Create a pull request + +We're excited that you're considering making a contribution to the Grafana project! This document guides you through the process of creating a [pull request](https://help.github.com/en/articles/about-pull-requests/). + +## Before you begin + +We know you're excited to create your first pull request. Before we get started, read these resources first: + +- Learn how to start [Contributing to Grafana](https://grafana.com/docs/contribute/overview/). +- Make sure your code follows the relevant [style guides](/contribute/style-guides). + +## Your first pull request + +If this is your first time contributing to an open-source project on GitHub, make sure you read about [Creating a pull request](https://help.github.com/en/articles/creating-a-pull-request). + +To increase the chance of having your pull request accepted, make sure your pull request follows these guidelines: + +- Title and description matches the implementation. +- Commits within the pull request follow the [style guide](#style-guide). +- The pull request closes one related issue. +- The pull request contains necessary tests that verify the intended behavior. +- If your pull request has conflicts, rebase your branch onto the master branch. + +If the pull request fixes a bug: + +- The pull request description must include `Closes #` or `Fixes #`. +- To avoid regressions, the pull request should include tests that replicate the fixed bug. + +### Frontend-specific guidelines + +Pull requests for frontend contributions must: + +- Use [Emotion](https://github.com/grafana/grafana/blob/master/style_guides/styling.md) for styling. +- Not increase the Angular code base. +- Not use `any` or `{}` without reason. +- Not contain large React components that could easily be split into several smaller components. +- Not contain backend calls directly from components—use actions and Redux instead. + +Pull requests for Redux contributions must: + +- Use the `actionCreatorFactory` and `reducerFactory` helpers instead of traditional switch statement reducers in Redux. Refer to [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details. +- Use `reducerTester` to test reducers. Refer to [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details. +- Not contain code that mutates state in reducers or thunks. +- Not contain code that accesses the reducers state slice directly. Instead, the code should use state selectors to access state. + +## Code review + +Once you've created a pull request, the next step is to have someone review your change. A review is a learning opportunity for both the reviewer and the author of the pull request. + +If you think a specific person needs to review your pull request, then you can tag them in the description or in a comment. Tag a user by typing the `@` symbol followed by their GitHub username. + +We recommend that you read [How to do a code review](https://google.github.io/eng-practices/review/reviewer/) to learn more about code reviews. + +## Formatting guidelines + +A well-written pull request minimizes the time to get your change accepted. These guidelines help you write good commit messages and descriptions for your pull requests. + +### Commit message format + +Grafana uses the guidelines for commit messages outlined in [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/), with the following additions: + +- Subject line must begin with the _area_ of the commit. +- A footer in the form of an optional [keyword and issue reference](https://help.github.com/en/articles/closing-issues-using-keywords). + +#### Area + +The area should use upper camel case, e.g. UpperCamelCase. + +Prefer using one of the following areas: + +- **Build:** Changes to the build system, or external dependencies. +- **Chore:** Changes that don't affect functionality. +- **Dashboard:** Changes to the Dashboard feature. +- **Docs:** Changes to documentation. +- **Explore:** Changes to the Explore feature. +- **Plugins:** Changes to any of the plugins. + +For changes to data sources, the area should be the name of the data source, e.g., AzureMonitor, Graphite, and Prometheus. + +For changes to panels, the area should be the name of the panel, suffixed with Panel, e.g., GraphPanel, SinglestatPanel, and TablePanel. + +**Example** + +- `Build: Support publishing MSI to grafana.com` +- `Explore: Add Live option for supported data sources` +- `GraphPanel: Fix legend sorting issues` + +### Pull request titles + +The Grafana team _squashes_ all commits into one when we accept a pull request. The title of the pull request becomes the subject line of the squashed commit message. We still encourage contributors to write informative commit messages, as they becomes a part of the Git commit body. + +We use the pull request title when we generate change logs for releases. As such, we strive to make the title as informative as possible. + +Make sure that the title for your pull request uses the same format as the subject line in the commit message. diff --git a/style_guides/README.md b/contribute/style-guides/README.md similarity index 71% rename from style_guides/README.md rename to contribute/style-guides/README.md index bd777ed25199..185851713b0b 100644 --- a/style_guides/README.md +++ b/contribute/style-guides/README.md @@ -2,8 +2,8 @@ This section contains style guides for the Grafana software project and documentation. -- [Backend style guide](https://github.com/grafana/grafana/blob/master/pkg/STYLEGUIDE.md): Provides guidance on how to style and format backend functionality and code. +- [Backend style guide](backend.md): Provides guidance on how to style and format backend functionality and code. - [Documentation style guide](documentation-style-guide.md): Provides guidance on how to style and format documentation. - [Frontend style guide](frontend.md): Provides guidance on how to style and format the user-facing functionality and code. - [Redux framework](redux.md): Provides guidance on designing the Grafana redux framework. -- [Themes style guide](themes.md): Provides guidance on designing and updating Grafana themes. \ No newline at end of file +- [Themes style guide](themes.md): Provides guidance on designing and updating Grafana themes. diff --git a/pkg/STYLEGUIDE.md b/contribute/style-guides/backend.md similarity index 95% rename from pkg/STYLEGUIDE.md rename to contribute/style-guides/backend.md index 3d162b61100a..338052cdfecf 100644 --- a/pkg/STYLEGUIDE.md +++ b/contribute/style-guides/backend.md @@ -5,7 +5,7 @@ Grafanas backend has been developed for a long time with a mix of code styles. This style guide is a guide for how we want to write Go code in the future. Generally, we want to follow the style guides used in Go [Code Review Comments](https://code.google.com/p/go-wiki/wiki/CodeReviewComments) and Peter Bourgon's [Go: Best Practices for Production Environments](http://peter.bourgon.org/go-in-production/#formatting-and-style) ## Linting and formatting -We enforce strict `gofmt` formating and use some linters on our codebase. You can lint the codebase with = { ... } static defaultProps = { ... } ``` -## State mangement +## State management - Don't mutate state in reducers or thunks. -- Use helpers `actionCreatorFactory` and `reducerFactory` instead of traditional `switch statement` reducers in Redux. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details. -- Use `reducerTester` to test reducers. See [Redux framework](https://github.com/grafana/grafana/tree/master/style_guides/redux.md) for more details. -- Use state selectors to access state instead of accessing state directly. \ No newline at end of file +- Use helpers `actionCreatorFactory` and `reducerFactory` instead of traditional `switch statement` reducers in Redux. See [Redux framework](redux.md) for more details. +- Use `reducerTester` to test reducers. See [Redux framework](redux.md) for more details. +- Use state selectors to access state instead of accessing state directly. diff --git a/style_guides/redux.md b/contribute/style-guides/redux.md similarity index 100% rename from style_guides/redux.md rename to contribute/style-guides/redux.md diff --git a/style_guides/styling.md b/contribute/style-guides/styling.md similarity index 100% rename from style_guides/styling.md rename to contribute/style-guides/styling.md diff --git a/style_guides/themes.md b/contribute/style-guides/themes.md similarity index 100% rename from style_guides/themes.md rename to contribute/style-guides/themes.md diff --git a/docs/README.md b/docs/README.md index ecdf4f5353aa..809688078758 100644 --- a/docs/README.md +++ b/docs/README.md @@ -6,14 +6,14 @@ The Markdown content however, is still public in this repository. We still encou # Building the docs -To build the docs locally, you need to have docker installed. The docs are built using [Hugo](http://gohugo.io/) - a static site generator. +To build the docs locally, you need to have Docker installed. The docs are built using [Hugo](http://gohugo.io/) - a static site generator. -**Prepare the Docker Image**: +**Prepare the Docker image**: -> Due to migration to new static site, the docker image needs to be built from `old-docs` branch. +> Due to migration to new static site, the Docker image needs to be built from `old-docs` branch. -Git clone `grafana/website` repo. Run these commands in the root of that repo. **Note** that you may require ``sudo`` -when running ``make docs-build`` depending on how your system's docker +Git clone `grafana/website` repo. Run these commands in the root of that repo. **Note** that you may require `sudo` +when running `make docs-build` depending on how your system's Docker service is configured): ``` @@ -24,7 +24,7 @@ make docs-build **Build the Documentation**: -Now that the docker image has been prepared we can build the +Now that the Docker image has been prepared we can build the grafana docs and start a docs server. If you have not cloned the Grafana repository already then: @@ -47,14 +47,14 @@ An AWS config file is required to build the docs Docker image and to publish the touch awsconfig ``` -Then run (possibly with ``sudo``): +Then run (possibly with `sudo`): ``` make watch ``` This command will not return control of the shell to the user. Instead -the command is now running a new docker container built from the image +the command is now running a new Docker container built from the image we created in the previous step. Open [localhost:3004](http://localhost:3004) to view the docs. @@ -63,20 +63,21 @@ Open [localhost:3004](http://localhost:3004) to view the docs. All markdown files are part of [this repository](https://github.com/grafana/grafana). However, all images are added to the [website repository](https://github.com/grafana/website). Therefore, the process of adding images is not as straightforward. These are the steps: -1. Ensure you create a feature branch within the [website repository](https://github.com/grafana/website) to make the change. This branch needs to be based on the `old-docs` branch. -2. Ensure the image(s) are compressed and optimised e.g. Using [tinypng](https://tinypng.com/) -2. Add the image(s) to the `/static/img/docs` directory -3. Then, make a commit that adds the image(s) -4. The Pull Request you create needs to target where you branched off, the branch `old-docs` +1. Ensure you create a feature branch within the [website repository](https://github.com/grafana/website) to make the change. This branch needs to be based on the `old-docs` branch. +1. Ensure the image(s) are compressed and optimised e.g. Using [tinypng](https://tinypng.com/). +1. Add the image(s) to the `/static/img/docs` directory. +1. Then, make a commit that adds the image(s). +1. The Pull Request you create needs to target where you branched off, the branch `old-docs`. Finally, run: + ``` make docs-build ``` -This will rebuild the docs docker image. +This will rebuild the docs Docker image. -To be able to use your image(s) you have to quit (CTRL-C) the `make watch` command (that you run in the same directory as this README). Then simply rerun `make watch`, it will restart the docs server but now with access to your image(s). +To be able to use your image(s) you have to quit (CTRL-C) the `make watch` command (that you run in the same directory as this README). Then simply rerun `make watch`, it will restart the docs server but now with access to your image(s). ### Editing content @@ -86,4 +87,4 @@ Changes to the markdown files should automatically cause a docs rebuild and live #### Running `make watch` errors out with `Warning: Task "default" not found.` -Ensure that the docker image from the [website repository](https://github.com/grafana/website) is built using the `old-docs` branch. +Ensure that the Docker image from the [website repository](https://github.com/grafana/website) is built using the `old-docs` branch. diff --git a/docs/sources/contribute/development/_index.md b/docs/sources/contribute/development/_index.md deleted file mode 100644 index 0916f5a0e015..000000000000 --- a/docs/sources/contribute/development/_index.md +++ /dev/null @@ -1,11 +0,0 @@ -+++ -title = "Development" -type = "docs" -[menu.docs] -name = "Development" -identifier = "development" -parent = "contribute" -weight = 2 -+++ - -# Development diff --git a/pkg/README.md b/pkg/README.md index 3226cec05635..cdb670f7d8a0 100644 --- a/pkg/README.md +++ b/pkg/README.md @@ -1,35 +1,43 @@ # Grafana backend codebase -The code [styleguide](STYLEGUIDE.md) and brief description of the [architecture](ARCHITECTURE.md) +The code [styleguide](/contribute/style-guides/backend.md) and brief description of the [architecture](ARCHITECTURE.md) -# On going refactorings. -These issues are not something we want to address all at once but something we will improve over time. Since Grafana is released at a regular schedule the prefer approuch is to do this in batches. Not only is it easier to review, it also reduces the risk of conflicts when cherry-picking fixes from master to release branches. Changes that spawn multiple locations are therefore prefered in the end of the release cycle since we make fewer patch releases in the end of the cycle. +# Ongoing refactorings + +These issues are not something we want to address all at once but something we will improve over time. Since Grafana is released at a regular schedule the preferred approach is to do this in batches. Not only is it easier to review, but it also reduces the risk of conflicts when cherry-picking fixes from master to release branches. Please try to submit changes that span multiple locations at the end of the release cycle. We prefer waiting until the end because we make fewer patch releases at the end of the release cycle, so there are fewer opportunities for complications. ## Global state + Global state makes testing and debugging software harder and its something we want to avoid when possible. Unfortunately, there is quite a lot of global state in Grafana. The way we want to migrate away from this is to use the `inject` package to wire up all dependencies either in `pkg/cmd/grafana-server/main.go` or self registering using `registry.RegisterService` ex https://github.com/grafana/grafana/blob/master/pkg/services/cleanup/cleanup.go#L25 ## Reduce the use of the init() function + Should only be used to register services/implementations. ## Settings refactoring + The plan is to move all settings to from package level vars in settings package to the [setting.Cfg](https://github.com/grafana/grafana/blob/df917663e6f358a076ed3daa9b199412e95c11f4/pkg/setting/setting.go#L210) struct. To access the settings services/components can inject this setting.Cfg struct. [Cfg struct](https://github.com/grafana/grafana/blob/df917663e6f358a076ed3daa9b199412e95c11f4/pkg/setting/setting.go#L210) [Injection example](https://github.com/grafana/grafana/blob/df917663e6f358a076ed3daa9b199412e95c11f4/pkg/services/cleanup/cleanup.go#L20) ## Reduce the use of Goconvey + We want to migrated away from using Goconvey and use stdlib testing as its the most common approuch in the GO community and we think it will make it easier for new contributors. Read more about how we want to write tests in the [ARCHITECTURE.MD](ARCHITECTURE.md#Testing) docs. ## Sqlstore refactoring + The sqlstore handlers all use a global xorm engine variable. This should be refactored to use the Sqlstore instance. ## Avoid global HTTP Handler functions + HTTP handlers should be refactored to so the handler methods are on the HttpServer instance or a more detailed handler struct. E.g (AuthHandler). This way they get access to HttpServer service dependencies (& Cfg object) and can avoid global state ## Date comparison + Newly introduced date columns in the database should be stored as epochs if date comparison is required. This permits to have a unifed approach for comparing dates against all the supported databases instead of handling seperately each one of them. In addition to this, by comparing epochs error pruning transformations from/to other time zones are no more needed. # Dependency management