mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-24 05:04:05 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

put every packages under the prometheus-io organization (#10849)

Browse source 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
This commit is contained in:
Augustin Husson 2022-06-13 15:19:07 +02:00 committed by GitHub
parent 4f3791024a
commit 5184f49a2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 132 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/ui/module/codemirror-promql/jest.config.cjs
View file

@ -12,7 +12,7 @@ module.exports = {
},
},
moduleNameMapper: {
'lezer-promql': '<rootDir>/../../node_modules/lezer-promql/dist/index.es.js'
'lezer-promql': '<rootDir>/../../node_modules/@prometheus-io/lezer-promql/dist/index.es.js'
},
transformIgnorePatterns: ["<rootDir>/../../node_modules/(?!lezer-promql)/"]
transformIgnorePatterns: ["<rootDir>/../../node_modules/(?!@prometheus-io/lezer-promql)/"]
};

4
web/ui/module/codemirror-promql/package.json
View file

@ -1,5 +1,5 @@
{
"name": "codemirror-promql",
"name": "@prometheus-io/codemirror-promql",
"version": "0.19.0",
"description": "a CodeMirror mode for the PromQL language",
"types": "dist/esm/index.d.ts",
@ -29,7 +29,7 @@
},
"homepage": "https://github.com/prometheus/prometheus/blob/main/web/ui/module/codemirror-promql/README.md",
"dependencies": {
"lezer-promql": "0.23.0",
"@prometheus-io/lezer-promql": "0.23.0",
"lru-cache": "^6.0.0"
},
"devDependencies": {

2
web/ui/module/codemirror-promql/src/complete/hybrid.test.ts
View file

@ -26,7 +26,7 @@ import {
numberTerms,
snippets,
} from './promql.terms';
import { EqlSingle, Neq } from 'lezer-promql';
import { EqlSingle, Neq } from '@prometheus-io/lezer-promql';
import { syntaxTree } from '@codemirror/language';
import { newCompleteStrategy } from './index';

2
web/ui/module/codemirror-promql/src/complete/hybrid.ts
View file

@ -58,7 +58,7 @@ import {
SubqueryExpr,
Unless,
VectorSelector,
} from 'lezer-promql';
} from '@prometheus-io/lezer-promql';
import { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
import { EditorState } from '@codemirror/state';
import { buildLabelMatchers, containsAtLeastOneChild, containsChild, retrieveAllRecursiveNodes, walkBackward, walkThrough } from '../parser';

2
web/ui/module/codemirror-promql/src/parser/matcher.test.ts
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { EqlRegex, EqlSingle, Neq, NeqRegex } from 'lezer-promql';
import { EqlRegex, EqlSingle, Neq, NeqRegex } from '@prometheus-io/lezer-promql';
import { labelMatchersToString } from './matcher';
import { Matcher } from '../types';

2
web/ui/module/codemirror-promql/src/parser/matcher.ts
View file

@ -12,7 +12,7 @@
// limitations under the License.
import { SyntaxNode } from '@lezer/common';
import { EqlRegex, EqlSingle, LabelName, MatchOp, Neq, NeqRegex, StringLiteral } from 'lezer-promql';
import { EqlRegex, EqlSingle, LabelName, MatchOp, Neq, NeqRegex, StringLiteral } from '@prometheus-io/lezer-promql';
import { EditorState } from '@codemirror/state';
import { Matcher } from '../types';

2
web/ui/module/codemirror-promql/src/parser/parser.ts
View file

@ -47,7 +47,7 @@ import {
UnaryExpr,
Unless,
VectorSelector,
} from 'lezer-promql';
} from '@prometheus-io/lezer-promql';
import { containsAtLeastOneChild, retrieveAllRecursiveNodes, walkThrough } from './path-finder';
import { getType } from './type';
import { buildLabelMatchers } from './matcher';

2
web/ui/module/codemirror-promql/src/parser/path-finder.test.ts
View file

@ -31,7 +31,7 @@ import {
NumberLiteral,
Sub,
VectorSelector,
} from 'lezer-promql';
} from '@prometheus-io/lezer-promql';
import { createEditorState } from '../test/utils-test';
import { containsAtLeastOneChild, containsChild, retrieveAllRecursiveNodes, walkBackward, walkThrough } from './path-finder';
import { SyntaxNode } from '@lezer/common';

2
web/ui/module/codemirror-promql/src/parser/type.ts
View file

@ -26,7 +26,7 @@ import {
SubqueryExpr,
UnaryExpr,
VectorSelector,
} from 'lezer-promql';
} from '@prometheus-io/lezer-promql';
import { walkThrough } from './path-finder';
import { getFunction, ValueType } from '../types';

2
web/ui/module/codemirror-promql/src/parser/vector.test.ts
View file

@ -14,7 +14,7 @@
import { buildVectorMatching } from './vector';
import { createEditorState } from '../test/utils-test';
import { walkThrough } from './path-finder';
import { BinaryExpr, Expr } from 'lezer-promql';
import { BinaryExpr, Expr } from '@prometheus-io/lezer-promql';
import { syntaxTree } from '@codemirror/language';
import { VectorMatchCardinality } from '../types';

2
web/ui/module/codemirror-promql/src/parser/vector.ts
View file

@ -26,7 +26,7 @@ import {
OnOrIgnoring,
Or,
Unless,
} from 'lezer-promql';
} from '@prometheus-io/lezer-promql';
import { VectorMatchCardinality, VectorMatching } from '../types';
import { containsAtLeastOneChild, retrieveAllRecursiveNodes } from './path-finder';

2
web/ui/module/codemirror-promql/src/promql.ts
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { parser } from 'lezer-promql';
import { parser } from '@prometheus-io/lezer-promql';
import { styleTags, tags } from '@codemirror/highlight';
import { Extension } from '@codemirror/state';
import { CompleteConfiguration, CompleteStrategy, newCompleteStrategy } from './complete';

2
web/ui/module/codemirror-promql/src/test/utils-test.ts
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { parser } from 'lezer-promql';
import { parser } from '@prometheus-io/lezer-promql';
import { EditorState } from '@codemirror/state';
import { LRLanguage } from '@codemirror/language';
import nock from 'nock';

2
web/ui/module/codemirror-promql/src/types/function.ts
View file

@ -79,7 +79,7 @@ import {
Timestamp,
Vector,
Year,
} from 'lezer-promql';
} from '@prometheus-io/lezer-promql';
export enum ValueType {
none = 'none',

2
web/ui/module/codemirror-promql/src/types/matcher.ts
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { EqlSingle, Neq } from 'lezer-promql';
import { EqlSingle, Neq } from '@prometheus-io/lezer-promql';
export class Matcher {
type: number;

2
web/ui/module/lezer-promql/package.json
View file

@ -1,5 +1,5 @@
{
"name": "lezer-promql",
"name": "@prometheus-io/lezer-promql",
"version": "0.23.0",
"description": "lezer-based PromQL grammar",
"main": "index.cjs",

210
web/ui/package-lock.json generated
View file

@ -1,10 +1,10 @@
{
"name": "prometheus",
"name": "prometheus-io",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "prometheus",
"name": "prometheus-io",
"workspaces": [
"react-app",
"module/*"
@ -27,10 +27,11 @@
}
},
"module/codemirror-promql": {
"name": "@prometheus-io/codemirror-promql",
"version": "0.19.0",
"license": "Apache-2.0",
"dependencies": {
"lezer-promql": "0.23.0",
"@prometheus-io/lezer-promql": "0.23.0",
"lru-cache": "^6.0.0"
},
"devDependencies": {
@ -60,6 +61,7 @@
}
},
"module/lezer-promql": {
"name": "@prometheus-io/lezer-promql",
"version": "0.23.0",
"license": "Apache-2.0",
"devDependencies": {
@ -3140,6 +3142,18 @@
"node": ">= 8"
}
},
"node_modules/@prometheus-io/app": {
"resolved": "react-app",
"link": true
},
"node_modules/@prometheus-io/codemirror-promql": {
"resolved": "module/codemirror-promql",
"link": true
},
"node_modules/@prometheus-io/lezer-promql": {
"resolved": "module/lezer-promql",
"link": true
},
"node_modules/@rollup/plugin-babel": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@ -5858,10 +5872,6 @@
"node": ">=4"
}
},
"node_modules/codemirror-promql": {
"resolved": "module/codemirror-promql",
"link": true
},
"node_modules/collect-v8-coverage": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
@ -8775,10 +8785,6 @@
"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
"dev": true
},
"node_modules/graph": {
"resolved": "react-app",
"link": true
},
"node_modules/gud": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
@ -10782,10 +10788,6 @@
"node": ">= 0.8.0"
}
},
"node_modules/lezer-promql": {
"resolved": "module/lezer-promql",
"link": true
},
"node_modules/lilconfig": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
@ -17312,7 +17314,7 @@
}
},
"react-app": {
"name": "graph",
"name": "@prometheus-io/app",
"version": "0.1.0",
"dependencies": {
"@codemirror/autocomplete": "^0.19.9",
@ -17333,8 +17335,8 @@
"@fortawesome/react-fontawesome": "0.1.17",
"@nexucis/fuzzy": "^0.4.0",
"@nexucis/kvsearch": "^0.7.0",
"@prometheus-io/codemirror-promql": "0.19.0",
"bootstrap": "^4.6.1",
"codemirror-promql": "0.19.0",
"css.escape": "^1.5.1",
"downshift": "^6.1.7",
"http-proxy-middleware": "^2.0.6",
@ -19602,6 +19604,93 @@
}
}
},
"@prometheus-io/app": {
"version": "file:react-app",
"requires": {
"@codemirror/autocomplete": "^0.19.9",
"@codemirror/closebrackets": "^0.19.0",
"@codemirror/commands": "^0.19.5",
"@codemirror/comment": "^0.19.0",
"@codemirror/highlight": "^0.19.6",
"@codemirror/history": "^0.19.2",
"@codemirror/language": "^0.19.7",
"@codemirror/lint": "^0.19.3",
"@codemirror/matchbrackets": "^0.19.3",
"@codemirror/search": "^0.19.3",
"@codemirror/state": "^0.19.6",
"@codemirror/view": "^0.19.27",
"@forevolve/bootstrap-dark": "^1.0.0",
"@fortawesome/fontawesome-svg-core": "6.1.1",
"@fortawesome/free-solid-svg-icons": "6.1.1",
"@fortawesome/react-fontawesome": "0.1.17",
"@nexucis/fuzzy": "^0.4.0",
"@nexucis/kvsearch": "^0.7.0",
"@prometheus-io/codemirror-promql": "0.19.0",
"@testing-library/react-hooks": "^7.0.1",
"@types/enzyme": "^3.10.10",
"@types/flot": "0.0.32",
"@types/jquery": "^3.5.9",
"@types/react": "^17.0.39",
"@types/react-copy-to-clipboard": "^5.0.2",
"@types/react-dom": "^17.0.11",
"@types/react-resize-detector": "^6.1.0",
"@types/react-router-dom": "^5.3.2",
"@types/sanitize-html": "^2.6.1",
"@types/sinon": "^10.0.6",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
"bootstrap": "^4.6.1",
"css.escape": "^1.5.1",
"downshift": "^6.1.7",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.2",
"fsevents": "^2.3.2",
"http-proxy-middleware": "^2.0.6",
"jquery": "^3.5.1",
"jquery.flot.tooltip": "^0.9.0",
"moment": "^2.29.2",
"moment-timezone": "^0.5.34",
"mutationobserver-shim": "^0.3.7",
"popper.js": "^1.14.3",
"react": "^17.0.2",
"react-copy-to-clipboard": "^5.0.4",
"react-dom": "^17.0.2",
"react-infinite-scroll-component": "^6.1.0",
"react-resize-detector": "^6.7.6",
"react-router-dom": "^5.2.1",
"react-test-renderer": "^17.0.2",
"reactstrap": "^8.9.0",
"sanitize-html": "^2.6.0",
"sass": "1.49.11",
"sinon": "^13.0.1",
"tempusdominus-bootstrap-4": "^5.1.2",
"tempusdominus-core": "^5.0.3"
}
},
"@prometheus-io/codemirror-promql": {
"version": "file:module/codemirror-promql",
"requires": {
"@codemirror/autocomplete": "^0.19.15",
"@codemirror/highlight": "^0.19.8",
"@codemirror/language": "^0.19.10",
"@codemirror/lint": "^0.19.6",
"@codemirror/state": "^0.19.9",
"@codemirror/view": "^0.19.48",
"@lezer/common": "^0.15.12",
"@lezer/lr": "^0.15.8",
"@prometheus-io/lezer-promql": "0.23.0",
"@types/lru-cache": "^5.1.1",
"isomorphic-fetch": "^3.0.0",
"lru-cache": "^6.0.0",
"nock": "^13.2.4"
}
},
"@prometheus-io/lezer-promql": {
"version": "file:module/lezer-promql",
"requires": {
"@lezer/generator": "^0.15.4",
"@lezer/lr": "^0.15.8"
}
},
"@rollup/plugin-babel": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@ -21720,24 +21809,6 @@
}
}
},
"codemirror-promql": {
"version": "file:module/codemirror-promql",
"requires": {
"@codemirror/autocomplete": "^0.19.15",
"@codemirror/highlight": "^0.19.8",
"@codemirror/language": "^0.19.10",
"@codemirror/lint": "^0.19.6",
"@codemirror/state": "^0.19.9",
"@codemirror/view": "^0.19.48",
"@lezer/common": "^0.15.12",
"@lezer/lr": "^0.15.8",
"@types/lru-cache": "^5.1.1",
"isomorphic-fetch": "^3.0.0",
"lezer-promql": "0.23.0",
"lru-cache": "^6.0.0",
"nock": "^13.2.4"
}
},
"collect-v8-coverage": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
@ -23932,68 +24003,6 @@
"integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
"dev": true
},
"graph": {
"version": "file:react-app",
"requires": {
"@codemirror/autocomplete": "^0.19.9",
"@codemirror/closebrackets": "^0.19.0",
"@codemirror/commands": "^0.19.5",
"@codemirror/comment": "^0.19.0",
"@codemirror/highlight": "^0.19.6",
"@codemirror/history": "^0.19.2",
"@codemirror/language": "^0.19.7",
"@codemirror/lint": "^0.19.3",
"@codemirror/matchbrackets": "^0.19.3",
"@codemirror/search": "^0.19.3",
"@codemirror/state": "^0.19.6",
"@codemirror/view": "^0.19.27",
"@forevolve/bootstrap-dark": "^1.0.0",
"@fortawesome/fontawesome-svg-core": "6.1.1",
"@fortawesome/free-solid-svg-icons": "6.1.1",
"@fortawesome/react-fontawesome": "0.1.17",
"@nexucis/fuzzy": "^0.4.0",
"@nexucis/kvsearch": "^0.7.0",
"@testing-library/react-hooks": "^7.0.1",
"@types/enzyme": "^3.10.10",
"@types/flot": "0.0.32",
"@types/jquery": "^3.5.9",
"@types/react": "^17.0.39",
"@types/react-copy-to-clipboard": "^5.0.2",
"@types/react-dom": "^17.0.11",
"@types/react-resize-detector": "^6.1.0",
"@types/react-router-dom": "^5.3.2",
"@types/sanitize-html": "^2.6.1",
"@types/sinon": "^10.0.6",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
"bootstrap": "^4.6.1",
"codemirror-promql": "0.19.0",
"css.escape": "^1.5.1",
"downshift": "^6.1.7",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.2",
"fsevents": "^2.3.2",
"http-proxy-middleware": "^2.0.6",
"jquery": "^3.5.1",
"jquery.flot.tooltip": "^0.9.0",
"moment": "^2.29.2",
"moment-timezone": "^0.5.34",
"mutationobserver-shim": "^0.3.7",
"popper.js": "^1.14.3",
"react": "^17.0.2",
"react-copy-to-clipboard": "^5.0.4",
"react-dom": "^17.0.2",
"react-infinite-scroll-component": "^6.1.0",
"react-resize-detector": "^6.7.6",
"react-router-dom": "^5.2.1",
"react-test-renderer": "^17.0.2",
"reactstrap": "^8.9.0",
"sanitize-html": "^2.6.0",
"sass": "1.49.11",
"sinon": "^13.0.1",
"tempusdominus-bootstrap-4": "^5.1.2",
"tempusdominus-core": "^5.0.3"
}
},
"gud": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
@ -25504,13 +25513,6 @@
"type-check": "~0.4.0"
}
},
"lezer-promql": {
"version": "file:module/lezer-promql",
"requires": {
"@lezer/generator": "^0.15.4",
"@lezer/lr": "^0.15.8"
}
},
"lilconfig": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",

2
web/ui/package.json
View file

@ -1,5 +1,5 @@
{
"name": "prometheus",
"name": "prometheus-io",
"private": true,
"scripts": {
"build": "bash build_ui.sh --all",

10
web/ui/react-app/package.json
View file

@ -1,5 +1,5 @@
{
"name": "graph",
"name": "@prometheus-io/app",
"version": "0.1.0",
"private": true,
"dependencies": {
@ -21,8 +21,8 @@
"@fortawesome/react-fontawesome": "0.1.17",
"@nexucis/fuzzy": "^0.4.0",
"@nexucis/kvsearch": "^0.7.0",
"@prometheus-io/codemirror-promql": "0.19.0",
"bootstrap": "^4.6.1",
"codemirror-promql": "0.19.0",
"css.escape": "^1.5.1",
"downshift": "^6.1.7",
"http-proxy-middleware": "^2.0.6",
@ -89,11 +89,11 @@
"enzyme-to-json/serializer"
],
"transformIgnorePatterns": [
"<rootDir>/../node_modules/(?!codemirror-promql)/",
"<rootDir>/../node_modules/(?!lezer-promql)/"
"<rootDir>/../node_modules/(?!@prometheus-io/codemirror-promql)/",
"<rootDir>/../node_modules/(?!@prometheus-io/lezer-promql)/"
],
"moduleNameMapper": {
"lezer-promql": "<rootDir>/../node_modules/lezer-promql/dist/index.cjs"
"lezer-promql": "<rootDir>/../node_modules/@prometheus-io/lezer-promql/dist/index.cjs"
}
},
"optionalDependencies": {

4
web/ui/react-app/src/pages/graph/ExpressionInput.tsx
View file

@ -19,8 +19,8 @@ import { faSearch, faSpinner, faGlobeEurope } from '@fortawesome/free-solid-svg-
import MetricsExplorer from './MetricsExplorer';
import { usePathPrefix } from '../../contexts/PathPrefixContext';
import { useTheme } from '../../contexts/ThemeContext';
import { CompleteStrategy, PromQLExtension } from 'codemirror-promql';
import { newCompleteStrategy } from 'codemirror-promql/dist/esm/complete';
import { CompleteStrategy, PromQLExtension } from '@prometheus-io/codemirror-promql';
import { newCompleteStrategy } from '@prometheus-io/codemirror-promql/dist/esm/complete';
const promqlExtension = new PromQLExtension();