diff --git a/docs/sources/enterprise/_index.md b/docs/sources/enterprise/_index.md index 181dc5c5786..bc7d1ac99a4 100644 --- a/docs/sources/enterprise/_index.md +++ b/docs/sources/enterprise/_index.md @@ -68,6 +68,7 @@ With a Grafana Enterprise license, you get access to premium data sources, inclu - [MongoDB](https://grafana.com/grafana/plugins/grafana-mongodb-datasource) - [New Relic](https://grafana.com/plugins/grafana-newrelic-datasource) - [Oracle Database](https://grafana.com/plugins/grafana-oracle-datasource) +- [Salesforce](https://grafana.com/grafana/plugins/grafana-salesforce-datasource/) - [SAP HANA®](https://grafana.com/grafana/plugins/grafana-saphana-datasource/) - [ServiceNow](https://grafana.com/grafana/plugins/grafana-servicenow-datasource) - [Snowflake](https://grafana.com/grafana/plugins/grafana-snowflake-datasource) diff --git a/public/app/features/admin/UpgradePage.tsx b/public/app/features/admin/UpgradePage.tsx index d4a508127c2..f597052c7ee 100644 --- a/public/app/features/admin/UpgradePage.tsx +++ b/public/app/features/admin/UpgradePage.tsx @@ -148,8 +148,14 @@ const FeatureListing: React.FC = () => { - + + + + + + + diff --git a/public/app/features/datasources/state/buildCategories.test.ts b/public/app/features/datasources/state/buildCategories.test.ts index d18d886ee59..04076b74e13 100644 --- a/public/app/features/datasources/state/buildCategories.test.ts +++ b/public/app/features/datasources/state/buildCategories.test.ts @@ -51,6 +51,6 @@ describe('buildCategories', () => { it('should add enterprise phantom plugins', () => { expect(categories[3].title).toBe('Enterprise plugins'); - expect(categories[3].plugins.length).toBe(12); + expect(categories[3].plugins.length).toBe(16); }); }); diff --git a/public/app/features/datasources/state/buildCategories.ts b/public/app/features/datasources/state/buildCategories.ts index 39381c5cf48..4969c07f932 100644 --- a/public/app/features/datasources/state/buildCategories.ts +++ b/public/app/features/datasources/state/buildCategories.ts @@ -164,10 +164,34 @@ function getEnterprisePhantomPlugins(): DataSourcePluginMeta[] { }), getPhantomPlugin({ id: 'grafana-honeycomb-datasource', - description: 'Honeycomb integration ad datasource', + description: 'Honeycomb integration and datasource', name: 'Honeycomb', imgUrl: 'public/img/plugins/honeycomb.png', }), + getPhantomPlugin({ + id: 'grafana-salesforce-datasource', + description: 'Salesforce integration and datasource', + name: 'Salesforce', + imgUrl: 'public/img/plugins/salesforce.svg', + }), + getPhantomPlugin({ + id: 'grafana-jira-datasource', + description: 'Jira integration and datasource', + name: 'Jira', + imgUrl: 'public/img/plugins/jira_logo.png', + }), + getPhantomPlugin({ + id: 'grafana-gitlab-datasource', + description: 'GitLab integration and datasource', + name: 'GitLab', + imgUrl: 'public/img/plugins/gitlab.svg', + }), + getPhantomPlugin({ + id: 'grafana-splunk-monitoring-datasource', + description: 'SignalFx integration and datasource', + name: 'Splunk Infrastructure Monitoring', + imgUrl: 'public/img/plugins/signalfx-logo.svg', + }), ]; } diff --git a/public/img/plugins/gitlab.svg b/public/img/plugins/gitlab.svg new file mode 100644 index 00000000000..edb193bd805 --- /dev/null +++ b/public/img/plugins/gitlab.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + 1x + + + 1x + + + 1x + + + + 1x + + + diff --git a/public/img/plugins/jira_logo.png b/public/img/plugins/jira_logo.png new file mode 100644 index 00000000000..4a09838aad4 Binary files /dev/null and b/public/img/plugins/jira_logo.png differ diff --git a/public/img/plugins/salesforce.svg b/public/img/plugins/salesforce.svg new file mode 100644 index 00000000000..e82db677c67 --- /dev/null +++ b/public/img/plugins/salesforce.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/plugins/signalfx-logo.svg b/public/img/plugins/signalfx-logo.svg new file mode 100644 index 00000000000..3337fbaa79f --- /dev/null +++ b/public/img/plugins/signalfx-logo.svg @@ -0,0 +1 @@ +