IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-19445 - Added version information to plugin diagnostics data (#13408)

Browse Source 
* MM-19609 - Add new prepackage configuration settings (#13062)

* Add signatures to the prepackaged plugins (#13138)

* MM-19612 - Support querying local plugin marketplace when upst… (#13250)

* MM-19612 - Support querying local plugin marketplace when upstream unavailable or disabled

* Update translations file

* Fixed comment

* Updated to check EnableRemoteMarketplace setting and LocalOnly to get marketplace plugins

* Fixed unit tests

* Tests cleanup code

* Removed unused error message

* Updated tests

* MM-19614- Updated Marketplace Service error id (#13388)

* Added version information to plugin diagnostics data

* [MM-19610] Consume prepackaged plugins (#13005)

* consume prepackaged plugins into memory

* missing i18n

* remove spurious .gitignore changes

* return on failure to install prepackged plugins

* cleanup

* s/plugins/availablePlugins

* whitespace

* don't return extractDir when not needed

* s/plug/plugin

* error on icon, cleanup

* update armored version of testplugin signature

* honour AutomaticPrepackagedPlugins

* document getPrepackagedPlugin

* MM-19613 - Include prepackaged plugins in marketplace results (#13433)

* Added prepackaged plugins to marketplace results

* PR Feedback

* PR Feedback

* Update error where definition

* Removing unnecessary var declaration

* Updated comments

* MM-21263 - Use EnableRemoteMarketplace in marketplace install… (#13438)

* MM-21263 - Use EnableRemoteMarketplace in marketplace install endpoint

* Call updateConfig before calling NewServer in TestHelper

* Added translations

* PR feedback

* Translations

* Feedback

* s/helpers.go/download.go

* Converging env.PrepackagedPlugins

* Initial PR feedback

* Ordered imports properly

* Updated DownloadURL to return slice of bytes

* Fixed method typo

* Fixed logging

* Added read lock for prepackaged plugins list

* PR Feedback

* Added condition to only install prepackaged plugin if it was previously enabled

* Linting

* Updated to check plugin state in config

* Flatten out version number to its own entries. Added webex

* Updated tests

Co-authored-by: Ali Farooq <ali.farooq0@pm.me>
Co-authored-by: Shota Gvinepadze <wineson@gmail.com>
Co-authored-by: Jesse Hallam <jesse.hallam@gmail.com>
This commit is contained in:
Maria A Nunez
2020-01-16 08:46:36 -05:00
committed by GitHub
parent 3d5f36cc4a
commit c21ea5bc06
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/diagnostics.go
View File

@@ -108,6 +108,15 @@ func pluginActivated(pluginStates map[string]*model.PluginState, pluginId string
return state.Enable
}
func pluginVersion(pluginsAvailable []*model.BundleInfo, pluginId string) string {
for _, plugin := range pluginsAvailable {
if plugin.Manifest != nil && plugin.Manifest.Id == pluginId {
return plugin.Manifest.Version
}
}
return ""
}
func (a *App) trackActivity() {
var userCount int64
var botAccountsCount int64
@@ -598,7 +607,7 @@ func (a *App) trackConfig() {
"trace": *cfg.ElasticsearchSettings.Trace,
})
a.SendDiagnostic(TRACK_CONFIG_PLUGIN, map[string]interface{}{
pluginConfigData := map[string]interface{}{
"enable_antivirus": pluginActivated(cfg.PluginSettings.PluginStates, "antivirus"),
"enable_autolink": pluginActivated(cfg.PluginSettings.PluginStates, "mattermost-autolink"),
"enable_aws_sns": pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.aws-sns"),
@@ -608,18 +617,39 @@ func (a *App) trackConfig() {
"enable_jenkins": pluginActivated(cfg.PluginSettings.PluginStates, "jenkins"),
"enable_jira": pluginActivated(cfg.PluginSettings.PluginStates, "jira"),
"enable_nps": pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.nps"),
"enable_nps_survey": pluginSetting(&cfg.PluginSettings, "com.mattermost.nps", "enablesurvey", true),
"enable_webex": pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.webex"),
"enable_welcome_bot": pluginActivated(cfg.PluginSettings.PluginStates, "com.mattermost.welcomebot"),
"enable_zoom": pluginActivated(cfg.PluginSettings.PluginStates, "zoom"),
"enable_nps_survey": pluginSetting(&cfg.PluginSettings, "com.mattermost.nps", "enablesurvey", true),
"enable": *cfg.PluginSettings.Enable,
"enable_uploads": *cfg.PluginSettings.EnableUploads,
"allow_insecure_download_url": *cfg.PluginSettings.AllowInsecureDownloadUrl,
"enable_health_check": *cfg.PluginSettings.EnableHealthCheck,
"enable_marketplace": *cfg.PluginSettings.EnableMarketplace,
"require_pluginSignature": *cfg.PluginSettings.RequirePluginSignature,
"enable_remote_marketplace": *cfg.PluginSettings.EnableRemoteMarketplace,
"is_default_marketplace_url": isDefault(*cfg.PluginSettings.MarketplaceUrl, model.PLUGIN_SETTINGS_DEFAULT_MARKETPLACE_URL),
"signature_public_key_files": len(cfg.PluginSettings.SignaturePublicKeyFiles),
})
}
pluginsEnvironment := a.GetPluginsEnvironment()
plugins, appErr := pluginsEnvironment.Available()
if appErr != nil {
pluginConfigData["version_antivirus"] = pluginVersion(plugins, "antivirus")
pluginConfigData["version_autolink"] = pluginVersion(plugins, "mattermost-autolink")
pluginConfigData["version_aws_sns"] = pluginVersion(plugins, "com.mattermost.aws-sns")
pluginConfigData["version_custom_user_attributes"] = pluginVersion(plugins, "com.mattermost.custom-attributes")
pluginConfigData["version_github"] = pluginVersion(plugins, "github")
pluginConfigData["version_gitlab"] = pluginVersion(plugins, "com.github.manland.mattermost-plugin-gitlab")
pluginConfigData["version_jenkins"] = pluginVersion(plugins, "jenkins")
pluginConfigData["version_jira"] = pluginVersion(plugins, "jira")
pluginConfigData["version_nps"] = pluginVersion(plugins, "com.mattermost.nps")
pluginConfigData["version_webex"] = pluginVersion(plugins, "com.mattermost.webex")
pluginConfigData["version_welcome_bot"] = pluginVersion(plugins, "com.mattermost.welcomebot")
pluginConfigData["version_zoom"] = pluginVersion(plugins, "zoom")
}
a.SendDiagnostic(TRACK_CONFIG_PLUGIN, pluginConfigData)
a.SendDiagnostic(TRACK_CONFIG_DATA_RETENTION, map[string]interface{}{
"enable_message_deletion": *cfg.DataRetentionSettings.EnableMessageDeletion,
@@ -706,6 +736,7 @@ func (a *App) trackPlugins() {
brokenManifestCount += 1
continue
}
if state, ok := pluginStates[plugin.Manifest.Id]; ok && state.Enable {
totalEnabledCount += 1
if plugin.Manifest.HasServer() {

20
app/diagnostics_test.go
View File

@@ -43,6 +43,26 @@ func TestPluginActivated(t *testing.T) {
assert.False(t, pluginActivated(states, "none"))
}
func TestPluginVersion(t *testing.T) {
plugins := []*model.BundleInfo{
{
Manifest: &model.Manifest{
Id: "test.plugin",
Version: "1.2.3",
},
},
{
Manifest: &model.Manifest{
Id: "test.plugin2",
Version: "4.5.6",
},
},
}
assert.Equal(t, "1.2.3", pluginVersion(plugins, "test.plugin"))
assert.Equal(t, "4.5.6", pluginVersion(plugins, "test.plugin2"))
assert.Empty(t, pluginVersion(plugins, "unknown.plugin"))
}
func TestDiagnostics(t *testing.T) {
if testing.Short() {
t.SkipNow()