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.

Sign up for GitHub

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

Jump to bottom

Update documentation links #2759

Merged
merged 3 commits into from Aug 30, 2016
Merged

Update documentation links #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b4e3eb
Remove unused imports
Aug 30, 2016
3b79eee
Add decorators documentation link
Aug 30, 2016
690d4f4
Add collector status documentation link
Aug 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion graylog2-web-interface/src/components/search/DecoratorSidebar.jsx
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@ import { Button, OverlayTrigger, Popover } from 'react-bootstrap';

import { Spinner } from 'components/common';
import { AddDecoratorButton, Decorator, DecoratorList } from 'components/search';
import DocumentationLink from 'components/support/DocumentationLink';
import DocsHelper from 'util/DocsHelper';
import PermissionsMixin from 'util/PermissionsMixin';

Expand Down Expand Up @@ -85,7 +86,7 @@ const DecoratorSidebar = React.createClass({
Use drag and drop to modify the order in which decorators are processed.
</p>
<p>
Read more about message decorators in the <a href={DocsHelper.toString('decorators.html')}>documentation</a>.
Read more about message decorators in the <DocumentationLink page={DocsHelper.PAGES.DECORATORS} text="documentation"/>.
</p>
</Popover>
);
Expand Down
2 changes: 0 additions & 2 deletions graylog2-web-interface/src/pages/UsersPage.jsx
View file
Open in desktop
Expand Up @@ -3,15 +3,13 @@ import Reflux from 'reflux';
import { Row, Col, Button } from 'react-bootstrap';
import { LinkContainer } from 'react-router-bootstrap';

import DocsHelper from 'util/DocsHelper';
import PermissionsMixin from 'util/PermissionsMixin';
import Routes from 'routing/Routes';

import StoreProvider from 'injection/StoreProvider';
const CurrentUserStore = StoreProvider.getStore('CurrentUser');

import { IfPermitted, PageHeader } from 'components/common';
import DocumentationLink from 'components/support/DocumentationLink';
import UserList from 'components/users/UserList';

const UsersPage = React.createClass({
Expand Down
2 changes: 2 additions & 0 deletions graylog2-web-interface/src/util/DocsHelper.js
View file
Open in desktop
Expand Up @@ -6,8 +6,10 @@ class DocsHelper {
CLUSTER_STATUS_EXPLAINED: 'configuration/elasticsearch.html#cluster-status-explained',
COLLECTOR: 'collector.html',
COLLECTOR_SIDECAR: 'collector_sidecar.html',
COLLECTOR_STATUS: 'collector_sidecar.html#sidecar-status',
CONFIGURING_ES: 'configuration/elasticsearch.html',
DASHBOARDS: 'dashboards.html',
DECORATORS: 'queries.html#decorators',
ES_CLUSTER_STATUS_RED: 'configuration/elasticsearch.html#cluster-status-explained',
ES_CLUSTER_UNAVAILABLE: 'configuration/elasticsearch.html#configuration',
ES_OPEN_FILE_LIMITS: 'configuration/elasticsearch.html#open-file-limits',
Expand Down