mirror of
https://github.com/grafana/grafana.git
synced 2024-11-21 16:38:03 -06:00
Chore: spelling - misc (#24438)
* Chore: spelling - misc * fix master merge
This commit is contained in:
Josh Soref
GitHub
parent
cb2d1b5f93
commit
ed92b41d47
2
.gitignore
vendored
2
.gitignore
vendored
@ -112,7 +112,7 @@ compilation-stats.json
|
||||
/packages/grafana-e2e/cypress/logs
|
||||
/e2e/server.log
|
||||
/e2e/**/screenshots
|
||||
!/e2e/**/screenshots/expeced/*
|
||||
!/e2e/**/screenshots/expected/*
|
||||
/e2e/**/videos/*
|
||||
|
||||
# report dumping the whole system env
|
||||
|
||||
@ -221,7 +221,7 @@ This is the most difficult thing with triaging issues since it requires a lot of
|
||||
|
||||
The key here is asking for help and discuss issues to understand how more experienced project members thinks and reason. By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
|
||||
|
||||
In any case there are uncertainty around the priorization of an issue, please ask the maintainers for help.
|
||||
In any case there are uncertainty around the prioritization of an issue, please ask the maintainers for help.
|
||||
|
||||
Label | Description
|
||||
------- | --------
|
||||
@ -313,7 +313,7 @@ Part of issue triage should also be triaging of external PRs. Main goal should b
|
||||
|
||||
### Setting up Gmail filters
|
||||
|
||||
If you're using Gmail it's highly recommened that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
|
||||
If you're using Gmail it's highly recommended that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
|
||||
|
||||
This may be setup by personal preference, but here's a working configuration for reference.
|
||||
1. Follow instructions in [gist](https://gist.github.com/marefr/9167c2e31466f6316c1cba118874e74f)
|
||||
|
||||
@ -749,7 +749,7 @@ rendering_clustering_mode =
|
||||
# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
|
||||
rendering_clustering_max_concurrency =
|
||||
|
||||
# Limit the maxiumum viewport width, height and device scale factor that can be requested.
|
||||
# Limit the maximum viewport width, height and device scale factor that can be requested.
|
||||
rendering_viewport_max_width =
|
||||
rendering_viewport_max_height =
|
||||
rendering_viewport_max_device_scale_factor =
|
||||
|
||||
@ -142,7 +142,7 @@
|
||||
;reporting_enabled = true
|
||||
|
||||
# Set to false to disable all checks to https://grafana.net
|
||||
# for new vesions (grafana itself and plugins), check is used
|
||||
# for new versions (grafana itself and plugins), check is used
|
||||
# in some UI views to notify that grafana or plugin update exists
|
||||
# This option does not cause any auto updates, nor send any information
|
||||
# only a GET request to http://grafana.com to get latest versions
|
||||
@ -739,7 +739,7 @@
|
||||
# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
|
||||
;rendering_clustering_max_concurrency =
|
||||
|
||||
# Limit the maxiumum viewport width, height and device scale factor that can be requested.
|
||||
# Limit the maximum viewport width, height and device scale factor that can be requested.
|
||||
;rendering_viewport_max_width =
|
||||
;rendering_viewport_max_height =
|
||||
;rendering_viewport_max_device_scale_factor =
|
||||
|
||||
@ -454,7 +454,7 @@
|
||||
"yaxes": [
|
||||
{
|
||||
"format": "percent",
|
||||
"label": "Perecent",
|
||||
"label": "Percent",
|
||||
"logBase": 1,
|
||||
"max": null,
|
||||
"min": null,
|
||||
|
||||
@ -155,7 +155,7 @@
|
||||
],
|
||||
"timeFrom": null,
|
||||
"timeShift": null,
|
||||
"title": "Last non nulll",
|
||||
"title": "Last non-null",
|
||||
"type": "gauge"
|
||||
},
|
||||
{
|
||||
|
||||
@ -454,7 +454,7 @@
|
||||
"yaxes": [
|
||||
{
|
||||
"format": "percent",
|
||||
"label": "Perecent",
|
||||
"label": "Percent",
|
||||
"logBase": 1,
|
||||
"max": null,
|
||||
"min": null,
|
||||
|
||||
@ -85,7 +85,7 @@
|
||||
}
|
||||
],
|
||||
"thresholds": "5,10",
|
||||
"title": "prefix 3 ms (green) postfixt + sparkline",
|
||||
"title": "prefix 3 ms (green) postfix + sparkline",
|
||||
"type": "singlestat",
|
||||
"valueFontSize": "80%",
|
||||
"valueMaps": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
# When not limiting the open file descritors limit, the memory consumption of
|
||||
# When not limiting the open file descriptors limit, the memory consumption of
|
||||
# slapd is absurdly high. See https://github.com/docker/docker/issues/8231
|
||||
ulimit -n 8192
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
# When not limiting the open file descritors limit, the memory consumption of
|
||||
# When not limiting the open file descriptors limit, the memory consumption of
|
||||
# slapd is absurdly high. See https://github.com/docker/docker/issues/8231
|
||||
ulimit -n 8192
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ usage() {
|
||||
echo "Usage:"
|
||||
echo " bulk-dashboards - create and provisioning 400 dashboards"
|
||||
echo " bulk-alerting-dashboards - create and provisioning 400 dashboards with alerts"
|
||||
echo " no args - provisiong core datasources and dev dashboards"
|
||||
echo " no args - provisioning core datasources and dev dashboards"
|
||||
}
|
||||
|
||||
main() {
|
||||
|
||||
@ -4,7 +4,7 @@ const PANEL_UNDER_TEST = '2 yaxis and axis labels';
|
||||
|
||||
e2e.scenario({
|
||||
describeName: 'Inspect drawer tests',
|
||||
itName: 'Testes various Inpect Drawer scenarios',
|
||||
itName: 'Tests various Inspect Drawer scenarios',
|
||||
addScenarioDataSource: false,
|
||||
addScenarioDashBoard: false,
|
||||
skipScenario: false,
|
||||
|
||||
@ -4,7 +4,7 @@ const PANEL_UNDER_TEST = 'Random walk series';
|
||||
|
||||
e2e.scenario({
|
||||
describeName: 'Panel edit tests',
|
||||
itName: 'Testes various Panel edit scenarios',
|
||||
itName: 'Tests various Panel edit scenarios',
|
||||
addScenarioDataSource: false,
|
||||
addScenarioDashBoard: false,
|
||||
skipScenario: false,
|
||||
|
||||
@ -15,7 +15,7 @@ import { toDataQueryResponse } from './queryResponse';
|
||||
const ExpressionDatasourceID = '__expr__';
|
||||
|
||||
/**
|
||||
* Describes the current healt status of a data source plugin.
|
||||
* Describes the current health status of a data source plugin.
|
||||
*
|
||||
* @public
|
||||
*/
|
||||
|
||||
@ -69,7 +69,7 @@ export function toDataQueryResponse(res: any): DataQueryResponse {
|
||||
|
||||
/**
|
||||
* Convert an object into a DataQueryError -- if this is an HTTP response,
|
||||
* it will put the correct values in the error filds
|
||||
* it will put the correct values in the error field
|
||||
*/
|
||||
export function toDataQueryError(err: any): DataQueryError {
|
||||
const error = (err || {}) as DataQueryError;
|
||||
|
||||
@ -55,7 +55,7 @@ const gitUrlParse = (url: string): { owner: string; name: string } => {
|
||||
};
|
||||
}
|
||||
|
||||
throw `Coult not find a suitable git repository. Received [${url}]`;
|
||||
throw `Could not find a suitable git repository. Received [${url}]`;
|
||||
};
|
||||
|
||||
const prepareRelease = useSpinner<any>('Preparing release', async ({ dryrun, verbose }) => {
|
||||
|
||||
@ -86,7 +86,7 @@ export const promptPluginDetails = async (name?: string) => {
|
||||
promptInput('keywords', 'Keywords (separated by comma)'),
|
||||
// Try using git specified username
|
||||
promptConfirm('author', `Author (${username})`, username, username !== ''),
|
||||
// Prompt for manual author entry if no git user.name specifed
|
||||
// Prompt for manual author entry if no git user.name specified
|
||||
promptInput('author', `Author`, true, undefined, (answers: any) => !answers.author || username === ''),
|
||||
promptInput('url', 'Your URL (i.e. organisation url)'),
|
||||
]);
|
||||
|
||||
@ -55,7 +55,7 @@ export async function setDashboardAcl(dashboardId: any, aclList: any) {
|
||||
await client.post(`/dashboards/id/${dashboardId}/permissions`, { items: aclList });
|
||||
}
|
||||
|
||||
const searchTestDataSetupRunnner: TaskRunner<SearchTestDataSetupOptions> = async ({ count }) => {
|
||||
const searchTestDataSetupRunner: TaskRunner<SearchTestDataSetupOptions> = async ({ count }) => {
|
||||
const user1 = await getUser({
|
||||
name: 'searchTestUser1',
|
||||
email: 'searchTestUser@team.com',
|
||||
@ -112,5 +112,5 @@ const searchTestDataSetupRunnner: TaskRunner<SearchTestDataSetupOptions> = async
|
||||
|
||||
export const searchTestDataSetupTask = new Task<SearchTestDataSetupOptions>(
|
||||
'Search test data setup',
|
||||
searchTestDataSetupRunnner
|
||||
searchTestDataSetupRunner
|
||||
);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { getPluginJson, validatePluginJson } from './pluginValidation';
|
||||
|
||||
describe('pluginValdation', () => {
|
||||
describe('pluginValidation', () => {
|
||||
describe('plugin.json', () => {
|
||||
test('missing plugin.json file', () => {
|
||||
expect(() => getPluginJson(`${__dirname}/mocks/missing-plugin.json`)).toThrowError();
|
||||
|
||||
@ -284,7 +284,7 @@ it('getTraceName() should return the trace name based on the parentSpan', () =>
|
||||
expect(traceSelectors.getTraceName(generatedTrace)).toBe(`${serviceName}: ${operationName}`);
|
||||
});
|
||||
|
||||
it('omitCollapsedSpans() should filter out collaped spans', () => {
|
||||
it('omitCollapsedSpans() should filter out collapsed spans', () => {
|
||||
const span = generatedTrace.spans[1];
|
||||
const size = traceSelectors.getTraceSpanIdsAsTree(generatedTrace).find(span.spanID).size - 1;
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ import './DividerDemo.css';
|
||||
|
||||
type DividerDemoProps = {
|
||||
position: number;
|
||||
updateState: (udpate: { dividerPosition: number }) => void;
|
||||
updateState: (update: { dividerPosition: number }) => void;
|
||||
};
|
||||
|
||||
export default class DividerDemo extends React.PureComponent<DividerDemoProps> {
|
||||
|
||||
@ -38,7 +38,7 @@ export default class DraggableManagerDemo extends React.PureComponent<{}, Dragga
|
||||
};
|
||||
}
|
||||
|
||||
_udpateState = (nextState: {}) => {
|
||||
_updateState = (nextState: {}) => {
|
||||
this.setState(nextState);
|
||||
};
|
||||
|
||||
@ -52,7 +52,7 @@ export default class DraggableManagerDemo extends React.PureComponent<{}, Dragga
|
||||
<p>Click and drag the gray divider in the colored area, below.</p>
|
||||
<p>Value: {dividerPosition.toFixed(3)}</p>
|
||||
<div className="DraggableManagerDemo--realm">
|
||||
<DividerDemo position={dividerPosition} updateState={this._udpateState} />
|
||||
<DividerDemo position={dividerPosition} updateState={this._updateState} />
|
||||
</div>
|
||||
</section>
|
||||
<section className="DraggableManagerDemo--scenario">
|
||||
@ -60,7 +60,7 @@ export default class DraggableManagerDemo extends React.PureComponent<{}, Dragga
|
||||
<p>Click and drag horizontally somewhere in the colored area, below.</p>
|
||||
<p>Value: {regionDragging && regionDragging.map(n => n.toFixed(3)).join(', ')}</p>
|
||||
<div className="DraggableManagerDemo--realm">
|
||||
<RegionDemo regionCursor={regionCursor} regionDragging={regionDragging} updateState={this._udpateState} />
|
||||
<RegionDemo regionCursor={regionCursor} regionDragging={regionDragging} updateState={this._updateState} />
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@ -218,7 +218,7 @@ text-decoration: underline;
|
||||
<table class="twelve columns" style="border-collapse: collapse; border-spacing: 0; margin: 0 auto; padding: 0; text-align: left; vertical-align: top; width: 580px;">
|
||||
<tr style="padding: 0; vertical-align: top;" align="left">
|
||||
<td class="center" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0px 0px 10px; word-break: break-word;" align="center" valign="top">
|
||||
<h3 style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; /*text-align: center*/; color: #D63232; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 22px; font-style: italic; font-weight: bold; line-height: 1.3; margin: 20px 0 0; padding: 0; word-break: normal;" align="left"><img src="http://play.grafana.org/img/critical.svg" style="-ms-interpolation-mode: bicubic; border: 0; clear: both; display: block; margin-right: 10px; outline: none !important; text-decoration: none !important; width: 40px;" align="left" /> [CRITICAL] Imaginary timeserie alert</h3>
|
||||
<h3 style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; /*text-align: center*/; color: #D63232; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 22px; font-style: italic; font-weight: bold; line-height: 1.3; margin: 20px 0 0; padding: 0; word-break: normal;" align="left"><img src="http://play.grafana.org/img/critical.svg" style="-ms-interpolation-mode: bicubic; border: 0; clear: both; display: block; margin-right: 10px; outline: none !important; text-decoration: none !important; width: 40px;" align="left" /> [CRITICAL] Imaginary timeseries alert</h3>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@ -172,7 +172,7 @@ export class TimeSrvStub {
|
||||
}
|
||||
|
||||
export class ContextSrvStub {
|
||||
isGrafanaVisibile = jest.fn();
|
||||
isGrafanaVisible = jest.fn();
|
||||
|
||||
getValidInterval() {
|
||||
return '10s';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user