Skip to content

Commit

Permalink
[8.x] Update autodetect.sh to detect additional integrations in a gen…
Browse files Browse the repository at this point in the history
…eric way. (#191383) (#193684)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Update autodetect.sh to detect additional integrations in a generic
way. (#191383)](#191383)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Richa
Talwar","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-17T08:55:57Z","message":"Update
autodetect.sh to detect additional integrations in a generic way.
(#191383)\n\n## Summary\r\nRelates:
https://github.com/elastic/observability-dev/issues/3826\r\n\r\nUpdate
`detect_known_integrations()` in `auto_detect.sh` for generic detection
using `integrations.conf` and added more integrations for auto
detect.","sha":"9c3561d97fcb7f12248bad9b18969dec9dbb819f","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-minor","ci:project-deploy-observability"],"title":"Update
autodetect.sh to detect additional integrations in a generic
way.","number":191383,"url":"https://github.com/elastic/kibana/pull/191383","mergeCommit":{"message":"Update
autodetect.sh to detect additional integrations in a generic way.
(#191383)\n\n## Summary\r\nRelates:
https://github.com/elastic/observability-dev/issues/3826\r\n\r\nUpdate
`detect_known_integrations()` in `auto_detect.sh` for generic detection
using `integrations.conf` and added more integrations for auto
detect.","sha":"9c3561d97fcb7f12248bad9b18969dec9dbb819f"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/191383","number":191383,"mergeCommit":{"message":"Update
autodetect.sh to detect additional integrations in a generic way.
(#191383)\n\n## Summary\r\nRelates:
https://github.com/elastic/observability-dev/issues/3826\r\n\r\nUpdate
`detect_known_integrations()` in `auto_detect.sh` for generic detection
using `integrations.conf` and added more integrations for auto
detect.","sha":"9c3561d97fcb7f12248bad9b18969dec9dbb819f"}}]}]
BACKPORT-->

Co-authored-by: Richa Talwar <[email protected]>
  • Loading branch information
kibanamachine and ritalwar authored Sep 23, 2024
1 parent 8a6da9b commit c56a365
Show file tree
Hide file tree
Showing 13 changed files with 628 additions and 143 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,22 @@ export const AutoDetectPanel: FunctionComponent = () => {
</EuiText>
<EuiSpacer size="s" />
<EuiFlexGroup gutterSize="s">
{['Apache', 'Docker', 'Nginx', 'System', 'Custom .log files'].map((item) => (
{[
'Apache',
'Docker',
'Nginx',
'System',
'MySQL',
'PostgreSQL',
'Redis',
'HAProxy',
'Kafka',
'RabbitMQ',
'Prometheus',
'Tomcat',
'MongoDB',
'Custom .log files',
].map((item) => (
<EuiFlexItem key={item} grow={false}>
<EuiBadge color="hollow">{item}</EuiBadge>
</EuiFlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ export const DASHBOARDS = {
'docker-AV4REOpp5NkDleZmzKkE': { type: 'metrics' },
'nginx-55a9e6e0-a29e-11e7-928f-5dbe6f6f5519': { type: 'logs' },
'system-79ffd6e0-faa0-11e6-947f-177f697178b8': { type: 'metrics' },
'mysql-Logs-MySQL-Dashboard': { type: 'logs' },
'postgresql-158be870-87f4-11e7-ad9c-db80de0bf8d3': { type: 'logs' },
'redis-7fea2930-478e-11e7-b1f0-cb29bac6bf8b': { type: 'logs' },
'haproxy-3560d580-aa34-11e8-9c06-877f0445e3e0': { type: 'logs' },
'rabbitmq-AV4YobKIge1VCbKU_qVo': { type: 'metrics' },
'kafka-943caca0-87ee-11e7-ad9c-db80de0bf8d3': { type: 'logs' },
'apache_tomcat-8fd54a20-1f0d-11ee-9d6b-bb41d08322c8': { type: 'logs' },
'mongodb-abcf35b0-0a82-11e8-bffe-ff7d4f68cf94': { type: 'logs' },
'prometheus-c181a040-3d96-11ed-b624-b12467b8df74': { type: 'metrics' },
};

export function useOnboardingFlow() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ export type SupportedLogo =
| 'apache'
| 'system'
| 'opentelemetry'
| 'mysql'
| 'postgresql'
| 'redis'
| 'haproxy'
| 'rabbitmq'
| 'kafka'
| 'mongodb'
| 'apache_tomcat'
| 'firehose';

export function isSupportedLogo(logo: string): logo is SupportedLogo {
Expand All @@ -41,6 +49,14 @@ export function isSupportedLogo(logo: string): logo is SupportedLogo {
'system',
'apache',
'opentelemetry',
'mysql',
'postgresql',
'redis',
'haproxy',
'rabbitmq',
'kafka',
'mongodb',
'apache_tomcat',
].includes(logo);
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c56a365

Please sign in to comment.