Add edition to usage ping

lib/gitlab/usage_data.rb

@@ -72,12 +72,14 @@ module Gitlab
           version: Gitlab::VERSION,
           active_user_count: User.active.count,
           recorded_at: Time.now,
-          mattermost_enabled: Gitlab.config.mattermost.enabled
+          mattermost_enabled: Gitlab.config.mattermost.enabled,
+          edition: 'EE'
         }
 
         license = ::License.current
 
         if license
+          usage_data[:edition] = license_edition(license.plan)
           usage_data[:license_md5] = Digest::MD5.hexdigest(license.data)
           usage_data[:historical_max_users] = ::HistoricalData.max_historical_user_count
           usage_data[:licensee] = license.licensee
@@ -89,6 +91,17 @@ module Gitlab
 
         usage_data
       end
+
+      def license_edition(plan)
+        case plan
+        when 'premium'
+          'EEP'
+        when 'starter'
+          'EES'
+        when nil # Older licenses
+          'EE'
+        end
+      end
     end
   end
 end

spec/lib/gitlab/usage_data_spec.rb

@@ -20,8 +20,9 @@ describe Gitlab::UsageData do
         licensee
         license_md5
         recorded_at
-        version
         mattermost_enabled
+        edition
+        version
         uuid
       ))
     end