Skip to content

Hugo website using docsy theme #1851

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

Merged
merged 3 commits into from
Dec 11, 2019
Merged

Conversation

cyriltovena
Copy link
Contributor

Hello !

This PR introduces a cortex website already deployed at https://cortexmetrics.io/, I don't think the last version is deployed /cc @tomwilkie I've added a lot of fixes for mobile users and the changelog.

The site is built using hugo.io and google docsy a special theme for open source content and documentation.

The website is based on the docs/ folder, it is moved to website/content/en/docs then we run a small tool (tools/website.go) to fixup the markup language.

To sync the docs use web-pre, to build the website use web-build, to run locally use web-server.

I've also updated the build image to include necessary tools to build the website. The CI has a new target to verify that the documentation and the website is in sync.

Let me know !

Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job @cyriltovena ! I left few comments, plus:

@cyriltovena
Copy link
Contributor Author

Thanks @pracucci for the review, to be honest I tried to rush this as this was an urgent task, been a while we are waiting for a website. I think the idea is to set the first stones and build on it.

I'll try to get your feedback in.

@cyriltovena
Copy link
Contributor Author

Some pages, like https://cortexmetrics.io/docs/configuration/, report Last modified January 1, 0001

@pracucci I think it will get fixed as soon as we merge this PR. I think hugo get the git commit when building.

I still have to look at how to push to gh-pages on merge to master.

@cyriltovena
Copy link
Contributor Author

Dashboards have been moved to k8s/dashboards/ but why the k8s root folder? I can't see anything Kubernetes specific: they're just Grafana dashboards

I couldn't find a better folder for it. Do you prefer to create a new root folder ? I need to move them out of the docs.

@cyriltovena
Copy link
Contributor Author

Links in https://cortexmetrics.io/docs/ open in a new tab, which looks weird for internal links like the ones in the Documentation section (https://cortexmetrics.io/docs/#documentation)

I couldn't find how to control this. It seems that Hugo is making all doc content link, blank ones.

@pracucci
Copy link
Contributor

Dashboards have been moved to k8s/dashboards/ but why the k8s root folder? I can't see anything Kubernetes specific: they're just Grafana dashboards

I couldn't find a better folder for it. Do you prefer to create a new root folder ? I need to move them out of the docs.

What's about dashboards/ root folder?

@cyriltovena
Copy link
Contributor Author

Alright it's all ready for deployment, I have a sync today with Jacob to setup credentials and test this.

@cyriltovena
Copy link
Contributor Author

/cc @gouthamve This is ready.

Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job! LGTM 👏

Copy link
Contributor

@gouthamve gouthamve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move the dashboards from a top level dir to production/dashboards?

Copy link
Contributor

@gouthamve gouthamve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WE CAN HAZ WEBSITE NOW!

The website is built using hugo and google docsy theme. A special theme for open source content.
The docs are copied over from the docs folder and massaged during the `web-pre` target to make them more
Hugo friendly. All you have to do is keep writing docs in the `docs/` folder.
The changelog and the governance document are also copied.

New target have been added:
- `web-build` rebuilds the website.
- `web-pre` move docs to website/content/en/docs and apply some pre-processing for fixing md and links.
- `web-deploy` deploy the website mainly used by CI.
- `web-serve` serve the website locally, don't forget to `web-pre` first to get the doc moved.

Signed-off-by: Tom Wilkie <[email protected]>
Signed-off-by: Cyril Tovena <[email protected]>
@gouthamve gouthamve merged commit 1dd96fd into cortexproject:master Dec 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants