grafana 0.9.0 → 0.10.1

data/lib/grafana/network.rb

@@ -60,55 +60,52 @@ module Grafana
     # @return [Hash]
     #
     def request( method_type = 'GET', endpoint = '/', data = {} )
+#       logger.debug( "request( #{method_type}, #{endpoint}, data )" )
+      raise 'try first login()' if @api_instance.nil?
 
-      raise 'try first login()' if  @api_instance.nil?
+      login( username: @username, password: @password )
 
       response             = nil
       response_code        = 404
       response_body        = ''
 
       begin
-
         case method_type.upcase
         when 'GET'
-          response = @api_instance[endpoint].get( @headers )
+          response = @api_instance[endpoint].get( headers )
         when 'POST'
-          response = @api_instance[endpoint].post( data, @headers )
+          response = @api_instance[endpoint].post( data, headers )
         when 'PATCH'
-          response = @api_instance[endpoint].patch( data, @headers )
+          response = @api_instance[endpoint].patch( data, headers )
         when 'PUT'
-          # response = @api_instance[endpoint].put( data, @headers )
-          @api_instance[endpoint].put( data, @headers ) do |response, request, result|
+          # response = @api_instance[endpoint].put( data, headers )
+          @api_instance[endpoint].put( data, headers ) do |resp, _request, _result|
+            response_body = resp.body
+            response_code = resp.code.to_i
+            response_body = JSON.parse(response_body) if response_body.is_a?(String)
 
-            case response.code
+            case response_code
             when 200
-              response_body = response.body
-              response_code = response.code.to_i
-              response_body = JSON.parse(response_body) if response_body.is_a?(String)
-
-              return {
-                'status' => response_code,
-                'message' => response_body.dig('message').nil? ? 'Successful' : response_body.dig('message')
-              }
+              return { 'status' => response_code, 'message' => response_body.dig('message').nil? ? 'Successful' : response_body.dig('message') }
             when 400
-              response_body = response.body
-              response_code = response.code.to_i
               raise RestClient::BadRequest
+            when 412
+              status  = response_body.dig('status')
+              message = response_body.dig('message')
+              message += " (#{status})"  unless(status.nil?)
+              return { 'status'  => response_code, 'message' => message }
+            when 422
+              raise RestClient::UnprocessableEntity
             else
-#               logger.error( response.code )
-#               logger.error( response.body )
-
-              body = JSON.parse(response.body) if(response_body.is_a?(String))
-              return {
-                'status' => response_code,
-                'message' => body.dig('message')
-              }
+#               logger.error( response_code )
+#               logger.error( response_body )
+              return { 'status' => response_code, 'message' => response_body.dig('message') }
               # response.return! # (request, result)
             end
           end
 
         when 'DELETE'
-          response = @api_instance[endpoint].delete( @headers )
+          response = @api_instance[endpoint].delete( headers )
         else
           @logger.error( "Error: #{__method__} is not a valid request method." )
           return false
@@ -118,95 +115,54 @@ module Grafana
         response_body    = response.body
         response_headers = response.headers
 
-        if( @debug )
-          logger.debug("response_code : #{response_code}" )
-          logger.debug("response_body : #{response_body}" )
-          logger.debug("response_headers : #{response_headers}" )
-        end
+#         if( @debug )
+#           logger.debug("response_code : #{response_code}" )
+#           logger.debug("response_body : #{response_body}" )
+#           logger.debug("response_headers : #{response_headers}" )
+#         end
 
         if( ( response_code >= 200 && response_code <= 299 ) || ( response_code >= 400 && response_code <= 499 ) )
 
           result = JSON.parse( response_body )
+          return { 'status' => response_code, 'message' => result } if( result.is_a?(Array) )
 
-          if( result.is_a?(Array) )
-            r_result= {
-              'status' => response_code,
-              'message' => result
-            }
-            return r_result
-          end
-
-          result_status = result.dig('status') if( result.is_a?( Hash ) )
-
+          result_status     = result.dig('status') if( result.is_a?( Hash ) )
           result['message'] = result_status unless( result_status.nil? )
           result['status']  = response_code
 
           return result
         else
-
           @logger.error( "#{__method__} #{method_type.upcase} on #{endpoint} failed: HTTP #{response.code} - #{response_body}" )
-          @logger.error( @headers )
+          @logger.error( headers )
           @logger.error( JSON.pretty_generate( response_headers ) )
 
           return JSON.parse( response_body )
         end
 
       rescue RestClient::BadRequest
-
         response_body = JSON.parse(response_body) if response_body.is_a?(String)
-
-        return {
-          'status' => 400,
-          'message' => response_body.dig('message').nil? ? 'Bad Request' : response_body.dig('message')
-        }
-
+        return { 'status' => 400, 'message' => response_body.dig('message').nil? ? 'Bad Request' : response_body.dig('message') }
       rescue RestClient::Unauthorized
-
-        return {
-          'status' => 401,
-          'message' => format('Not authorized to connect \'%s/%s\' - wrong username or password?', @url, endpoint)
-        }
+        return { 'status' => 401, 'message' => format('Not authorized to connect \'%s/%s\' - wrong username or password?', @url, endpoint) }
       rescue RestClient::Forbidden
-
-        return {
-          'status' => 403,
-          'message' => format('The operation is forbidden \'%s/%s\'', @url, endpoint)
-        }
-
+        return { 'status' => 403, 'message' => format('The operation is forbidden \'%s/%s\'', @url, endpoint) }
       rescue RestClient::NotFound
-
-        return {
-          'status' => 404,
-          'message' => 'Not Found'
-        }
-
+        return { 'status' => 404, 'message' => 'Not Found' }
       rescue RestClient::Conflict
-
-        return {
-          'status' => 409,
-          'message' => 'Conflict with the current state of the target resource'
-        }
-
+        return { 'status' => 409, 'message' => 'Conflict with the current state of the target resource' }
       rescue RestClient::PreconditionFailed
-
-        return {
-          'status' => 412,
-          'message' => 'Precondition failed. The Object probably already exists.'
-        }
-
-      rescue RestClient::ExceptionWithResponse => e
-
-        logger.error( "Error: #{__method__} #{method_type.upcase} on #{endpoint} error: '#{e}'" )
-        logger.error( data )
-        logger.error( @headers )
-        logger.error( JSON.pretty_generate( response_headers ) )
-
-        return false
-
+        return { 'status' => 412, 'message' => 'Precondition failed. The Object probably already exists.' }
+      rescue RestClient::PreconditionFailed
+        return { 'status' => 412, 'message' => 'Precondition failed. The Object probably already exists.' }
+      rescue RestClient::ExceptionWithResponse => error
+#        logger.error( "Error: #{__method__} #{method_type.upcase} on #{endpoint} error: '#{error}'" )
+#        logger.error( "query: #{data}" )
+        return { 'status' => 500, 'message' => "Internal Server Error: #{error}" }
+      rescue => error
+#        logger.error( "Error: #{__method__} #{method_type.upcase} on #{endpoint} error: '#{error}'" )
+#        logger.error( "query: #{data}" )
+        return { 'status' => 500, 'message' => "Internal Server Error: #{error}" }
       end
-
     end
-
   end
-
 end

data/lib/grafana/organization.rb

@@ -103,7 +103,8 @@ module Grafana
 
       if( org.is_a?(Hash) && org.dig('status').to_i == 200 )
         org = org.dig('message')
-        return { 'status' => 404, 'message' => format('User \'%s\' are already in the organisation', login_or_email) } if( org.select { |x| x.dig('email') == login_or_email || x.dig('login') == login_or_email }.count >= 1 )
+        return { 'status' => 404, 'message' => format('User \'%s\' are already in the organisation', login_or_email) } \
+          if( org.select { |x| x.dig('email') == login_or_email || x.dig('login') == login_or_email }.count >= 1 )
       end
 
       endpoint = '/api/org/users'

data/lib/grafana/organizations.rb

@@ -23,7 +23,10 @@ module Grafana
     #
     def organization( organisation_id )
 
-      raise ArgumentError.new(format('wrong type. user \'organisation_id\' must be an String (for an Datasource name) or an Integer (for an Datasource Id), given \'%s\'', organisation_id.class.to_s)) if( organisation_id.is_a?(String) && organisation_id.is_a?(Integer) )
+      if( organisation_id.is_a?(String) && organisation_id.is_a?(Integer))
+        raise ArgumentError.new(format('wrong type. \'organisation_id\' must be an String (for an Datasource name) ' \
+                                       'or an Integer (for an Datasource Id), given \'%s\'', organisation_id.class.to_s))
+      end
       raise ArgumentError.new('missing \'organisation_id\'') if( organisation_id.size.zero? )
 
       endpoint = format( '/api/orgs/%d', organisation_id ) if(organisation_id.is_a?(Integer))
@@ -83,7 +86,10 @@ module Grafana
     #
     def organization_users( organization_id )
 
-      raise ArgumentError.new(format('wrong type. user \'organization_id\' must be an String (for an Organisation name) or an Integer (for an Organisation Id), given \'%s\'', organization_id.class.to_s)) if( organization_id.is_a?(String) && organization_id.is_a?(Integer) )
+      if( organization_id.is_a?(String) && organization_id.is_a?(Integer))
+        raise ArgumentError.new(format('wrong type. \'organization_id\' must be an String (for an Organisation name) '\
+                                       'or an Integer (for an Organisation Id), given \'%s\'', organization_id.class.to_s))
+      end
       raise ArgumentError.new('missing \'organization_id\'') if( organization_id.size.zero? )
 
       if(organization_id.is_a?(String))
@@ -266,7 +272,10 @@ module Grafana
     #
     def delete_organisation( organisation_id )
 
-      raise ArgumentError.new(format('wrong type. user \'organisation_id\' must be an String (for an Datasource name) or an Integer (for an Datasource Id), given \'%s\'', organisation_id.class.to_s)) if( organisation_id.is_a?(String) && organisation_id.is_a?(Integer) )
+      if( organisation_id.is_a?(String) && organisation_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. \'organisation_id\' must be an String (for an Organisation name) ' \
+                                       'or an Integer (for an Organisation Id), given \'%s\'', organisation_id.class.to_s))
+      end
       raise ArgumentError.new('missing \'organisation_id\'') if( organisation_id.size.zero? )
 
       if(organisation_id.is_a?(String))
@@ -275,7 +284,7 @@ module Grafana
         data.each do |d|
           organisation_map[d.dig('id')] = d.dig('name')
         end
-        organisation_id = organisation_map.select { |x,y| y == organisation_id }.keys.first if( organisation_map )
+        organisation_id = organisation_map.select { |_,y| y == organisation_id }.keys.first if( organisation_map )
       end
 
       return { 'status' => 404, 'message' => format( 'No Organisation \'%s\' found', organisation_id) } if( organisation_id.nil? )

data/lib/grafana/preferences.rb

@@ -0,0 +1,122 @@
+module Grafana
+
+  #
+  #
+  #
+  #
+  #
+  # original API Documentation can be found under: http://docs.grafana.org/http_api/preferences/#user-and-org-preferences-api
+  #
+  module Preferences
+
+    # Get Current User Prefs
+    # GET /api/user/preferences
+    def user_preferences()
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has folder support. you use version %s', v) } if(mv != 5)
+
+      endpoint = '/api/user/preferences'
+      @logger.debug("Getting current user preferences (GET #{endpoint})") if @debug
+      get(endpoint)
+    end
+
+
+    # Update Current User Prefs
+    # PUT /api/user/preferences
+    #
+    # theme - One of: light, dark, or an empty string for the default theme
+    # homeDashboardId - The numerical :id of a favorited dashboard, default: 0
+    # timezone - One of: utc, browser, or an empty string for the default
+    #
+    def update_user_preferences(params)
+
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
+
+      endpoint = '/api/user/preferences'
+      @logger.debug("update current user preferences (GET #{endpoint})") if @debug
+
+      update_preferences( endpoint, params )
+    end
+
+
+    # Get Current Org Prefs
+    # GET /api/org/preferences
+    def org_preferences()
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has folder support. you use version %s', v) } if(mv != 5)
+
+      endpoint = '/api/org/preferences'
+      @logger.debug("Getting current organisation preferences (GET #{endpoint})") if @debug
+      get(endpoint)
+    end
+
+
+
+    # Update Current Org Prefs
+    # PUT /api/org/preferences
+    #
+    # theme - One of: light, dark, or an empty string for the default theme
+    # homeDashboardId - The numerical :id of a favorited dashboard, default: 0
+    # timezone - One of: utc, browser, or an empty string for the default
+    #
+    def update_org_preferences(params)
+
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
+
+      endpoint = '/api/org/preferences'
+      @logger.debug("update current organisation preferences (GET #{endpoint})") if @debug
+
+      update_preferences( endpoint, params )
+    end
+
+
+    private
+    def update_preferences( endpoint, params )
+
+      theme          = validate( params, required: false, var: 'theme'         , type: String )
+      timezone       = validate( params, required: false, var: 'timezone'      , type: String )
+      home_dashboard = validate( params, required: false, var: 'home_dashboard')
+
+      valid_theme    = %w[light dark]
+      valid_timezone = %w[utc browser]
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has folder support. you use version %s', v) } if(mv != 5)
+
+      unless(theme.nil?)
+        v_theme = validate_hash( theme, valid_theme )
+        return v_theme unless( v_theme == true )
+      end
+
+      unless(timezone.nil?)
+        v_timez = validate_hash( timezone, valid_timezone )
+        return v_timez unless( v_timez == true )
+      end
+
+      unless(home_dashboard.nil?)
+        v_dashboard = dashboard(home_dashboard)
+        return { 'status' => 404, 'message' => format('dashboard \'%s\' not found',home_dashboard) }\
+            unless(v_dashboard.dig('status') == 200)
+
+        dashboard_id = v_dashboard.dig('dashboard','id')
+      end
+
+      payload = {
+        theme: theme,
+        homeDashboardId: dashboard_id,
+        timezone: timezone
+      }
+      payload.reject!{ |_, y| y.nil? }
+
+#      endpoint = '/api/user/preferences'
+#      @logger.debug("update current preferences (GET #{endpoint})") if @debug
+
+      put(endpoint, payload.to_json)
+    end
+
+  end
+end

data/lib/grafana/teams.rb

@@ -0,0 +1,364 @@
+
+module Grafana
+
+  # http://docs.grafana.org/http_api/team/
+  #
+  # This API can be used to create/update/delete Teams and to add/remove users to Teams.
+  # All actions require that the user has the Admin role for the organization.
+  #
+  module Teams
+
+    # http://docs.grafana.org/http_api/team/#team-search-with-paging
+    #
+    # GET /api/teams/search?perpage=50&page=1&query=myteam
+    # or
+    # GET /api/teams/search?name=myteam
+    #
+    # Default value for the perpage parameter is 1000 and for the page parameter is 1.
+    #
+    # The totalCount field in the response can be used for pagination of the teams list
+    # E.g. if totalCount is equal to 100 teams and the perpage parameter is set to 10 then there are 10 pages of teams.
+    #
+    # The query parameter is optional and it will return results where the query value is contained in the name field.
+    # Query values with spaces need to be url encoded e.g. query=my%20team.
+    #
+    # The name parameter returns a single team if the parameter matches the name field.
+
+
+
+    #
+    # Status Codes:
+    #
+    # 200 - Ok
+    # 401 - Unauthorized
+    # 403 - Permission denied
+    # 404 - Team not found (if searching by name)
+    #
+    def search_team( params )
+
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has team support. you use version %s', v) } if(mv != 5)
+
+      perpage = validate( params, required: false, var: 'perpage', type: Integer ) || 1000
+      page    = validate( params, required: false, var: 'page'   , type: Integer ) || 1
+      query   = validate( params, required: false, var: 'query'  , type: String )
+      name    = validate( params, required: false, var: 'name'   , type: String )
+
+      if(name.nil?)
+        api     = []
+        api << format( 'perpage=%s', perpage ) unless( perpage.nil? )
+        api << format( 'page=%s', page ) unless( page.nil? )
+        api << format( 'query=%s', CGI.escape( query ) ) unless( query.nil? )
+
+        api = api.join( '&' )
+
+        endpoint = format('/api/teams/search?%s', api)
+      else
+        endpoint = format('/api/teams/search?name=%s',CGI.escape(name))
+      end
+
+      @logger.debug("Attempting to search for alerts (GET #{endpoint})") if @debug
+
+      r = get(endpoint)
+      r['status'] = 404 if( r.dig('totalCount').zero? )
+      r
+    end
+
+    # http://docs.grafana.org/http_api/team/#get-team-by-id
+    #
+    # Get Team By Id
+    # GET /api/teams/:id
+    #
+    #
+    def team( team_id )
+
+      if( team_id.is_a?(String) && team_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. user \'team_id\' must be an String (for an Team name) or an Integer (for an Team Id), given \'%s\'', team_id.class.to_s))
+      end
+      raise ArgumentError.new('missing \'team_id\'') if( team_id.size.zero? )
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has team support. you use version %s', v) } if(mv != 5)
+
+      if(team_id.is_a?(String))
+        o_team = search_team(name: team_id)
+        status      = o_team.dig('status')
+        total_count = o_team.dig('totalCount')
+
+        return { 'status' => 404, 'message' => format( 'No Team \'%s\' found', team_id) } unless(status == 200 && total_count > 0)
+
+        teams = o_team.dig('teams')
+        team  = teams.detect { |x| x['name'] == team_id }
+        team_id = team.dig('id')
+      end
+
+      endpoint = format( '/api/teams/%s', team_id )
+
+      @logger.debug("Getting team by Id #{team_id} (GET #{endpoint})") if @debug
+      get(endpoint)
+    end
+
+    # http://docs.grafana.org/http_api/team/#add-team
+    #
+    # The Team name needs to be unique. name is required and email is optional.
+    # POST /api/teams
+    #
+    #
+    def add_team( params )
+
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has team support. you use version %s', v) } if(mv != 5)
+
+      name  = validate( params, required: true, var: 'name'  , type: String )
+      email = validate( params, required: false, var: 'email', type: String )
+
+      o_team = search_team(name: name)
+
+      status      = o_team.dig('status')
+      total_count = o_team.dig('totalCount')
+#         teams = o_team.dig('teams')
+#         team  = teams.detect { |x| x['name'] == name }
+
+      return { 'status' => 404, 'message' => format('team \'%s\' alread exists', name) } if(status == 200 && total_count > 0)
+
+      endpoint = '/api/teams'
+
+      payload = {
+        name: name,
+        email: email
+      }
+      payload.reject!{ |_, y| y.nil? }
+
+      @logger.debug("Creating team: #{name} (POST #{endpoint})") if @debug
+
+      post( endpoint, payload.to_json )
+    end
+
+    # http://docs.grafana.org/http_api/team/#update-team
+    #
+    # There are two fields that can be updated for a team: name and email.
+    # PUT /api/teams/:id
+    #
+    def update_team( params )
+
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has team support. you use version %s', v) } if(mv != 5)
+
+      team_id = validate( params, required: true , var: 'team_id' )
+      name    = validate( params, required: false, var: 'name' , type: String )
+      email   = validate( params, required: true , var: 'email', type: String )
+
+      if(team_id.is_a?(String))
+        o_team = search_team(name: team_id)
+        status      = o_team.dig('status')
+        total_count = o_team.dig('totalCount')
+
+        return { 'status' => 404, 'message' => format( 'No Team \'%s\' found', team_id) } unless(status == 200 && total_count > 0)
+
+        teams = o_team.dig('teams')
+        team  = teams.detect { |x| x['name'] == team_id }
+
+        team_id = team.dig('id')
+      end
+
+      payload = {
+        email: email,
+        name: name
+      }
+      payload.reject!{ |_, y| y.nil? }
+
+      endpoint = format( '/api/teams/%d', team_id )
+      @logger.debug("Updating team with Id #{team_id} (PUT #{endpoint})") if @debug
+
+      put( endpoint, payload.to_json )
+    end
+
+    # http://docs.grafana.org/http_api/team/#delete-team-by-id
+    #
+    # DELETE /api/teams/:id
+    #
+    #
+    #
+    #
+    #
+    #
+    def delete_team(team_id)
+
+      if( team_id.is_a?(String) && team_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. user \'team_id\' must be an String (for an Team name) or an Integer (for an Team Id), given \'%s\'', team_id.class.to_s))
+      end
+      raise ArgumentError.new('missing \'team_id\'') if( team_id.size.zero? )
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has team support. you use version %s', v) } if(mv != 5)
+
+      if(team_id.is_a?(String))
+        o_team = search_team(name: team_id)
+
+        status      = o_team.dig('status')
+        total_count = o_team.dig('totalCount')
+
+        return { 'status' => 404, 'message' => format( 'No Team \'%s\' found', team_id) } unless(status == 200 && total_count > 0)
+
+        teams = o_team.dig('teams')
+        team  = teams.detect { |x| x['name'] == team_id }
+
+        team_id = team.dig('id')
+      end
+
+      endpoint = format( '/api/teams/%s', team_id )
+
+      @logger.debug("delete team Id #{team_id} (GET #{endpoint})") if @debug
+      delete(endpoint)
+    end
+
+    # http://docs.grafana.org/http_api/team/#get-team-members
+    #
+    # GET /api/teams/:teamId/members
+    #
+    #
+    #
+    #
+    def team_members(team_id)
+
+      if( team_id.is_a?(String) && team_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. user \'team_id\' must be an String (for an Team name) or an Integer (for an Team Id), given \'%s\'', team_id.class.to_s))
+      end
+      raise ArgumentError.new('missing \'team_id\'') if( team_id.size.zero? )
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has team support. you use version %s', v) } if(mv != 5)
+
+      if(team_id.is_a?(String))
+        o_team = search_team(name: team_id)
+
+        status      = o_team.dig('status')
+        total_count = o_team.dig('totalCount')
+
+        return { 'status' => 404, 'message' => format( 'No Team \'%s\' found', team_id) } unless(status == 200 && total_count > 0)
+
+        teams = o_team.dig('teams')
+        team  = teams.detect { |x| x['name'] == team_id }
+
+        team_id = team.dig('id')
+      end
+
+      endpoint = format( '/api/teams/%s/members', team_id )
+
+      @logger.debug("Getting team by Id #{team_id} (GET #{endpoint})") if @debug
+
+      get(endpoint)
+    end
+
+    # http://docs.grafana.org/http_api/team/#add-team-member
+    #
+    # POST /api/teams/:teamId/members
+    #
+    #
+    #
+    def add_team_member(params)
+
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has team support. you use version %s', v) } if(mv != 5)
+
+      team_id = validate( params, required: true , var: 'team_id' )
+      user_id = validate( params, required: false, var: 'user_id' )
+
+      if( user_id.is_a?(String) && user_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. user \'user_id\' must be an String (for an User name) or an Integer (for an User Id), given \'%s\'', user_id.class.to_s))
+      end
+      raise ArgumentError.new('missing \'user_id\'') if( user_id.size.zero? )
+
+      if(team_id.is_a?(String))
+        o_team = search_team(name: team_id)
+        status      = o_team.dig('status')
+        total_count = o_team.dig('totalCount')
+
+        return { 'status' => 404, 'message' => format( 'No Team \'%s\' found', team_id) } unless(status == 200 && total_count > 0)
+
+        teams = o_team.dig('teams')
+        team  = teams.detect { |x| x['name'] == team_id }
+
+        team_id = team.dig('id')
+      end
+
+      if(user_id.is_a?(String))
+        usr     = user(user_id)
+        status  = usr.dig('status')
+        user_id  = usr.dig('id')
+
+        return { 'status' => 404, 'message' => format( 'No User \'%s\' found', user_id) } unless(status == 200)
+      end
+
+      payload = {
+        userId: user_id
+      }
+      payload.reject!{ |_, y| y.nil? }
+
+      endpoint = format( '/api/teams/%d/members', team_id )
+
+      post( endpoint, payload.to_json )
+    end
+
+    # http://docs.grafana.org/http_api/team/#remove-member-from-team
+    #
+    # DELETE /api/teams/:teamId/members/:userId
+    #
+    #
+    #
+    def remove_team_member(params)
+
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
+
+      v, mv = version.values
+      return { 'status' => 404, 'message' => format( 'only Grafana 5 has team support. you use version %s', v) } if(mv != 5)
+
+      team_id = validate( params, required: true , var: 'team_id' )
+      user_id = validate( params, required: false, var: 'user_id' )
+
+      if( user_id.is_a?(String) && user_id.is_a?(Integer) )
+        raise ArgumentError.new(format('wrong type. user \'user_id\' must be an String (for an User name) or an Integer (for an User Id), given \'%s\'', user_id.class.to_s))
+      end
+      raise ArgumentError.new('missing \'user_id\'') if( user_id.size.zero? )
+
+      if(team_id.is_a?(String))
+        o_team = search_team(name: team_id)
+        status      = o_team.dig('status')
+        total_count = o_team.dig('totalCount')
+
+        return { 'status' => 404, 'message' => format( 'No Team \'%s\' found', team_id) } unless(status == 200 && total_count > 0)
+
+        teams = o_team.dig('teams')
+        team  = teams.detect { |x| x['name'] == team_id }
+
+        team_id = team.dig('id')
+      end
+
+      if(user_id.is_a?(String))
+        usr     = user(user_id)
+        status  = usr.dig('status')
+        usr_id  = usr.dig('id')
+
+        return { 'status' => 404, 'message' => format( 'No User \'%s\' found', user_id) } unless(status == 200)
+      end
+
+      endpoint = format( '/api/teams/%d/members/%d', team_id, usr_id )
+
+      delete(endpoint)
+    end
+
+  end
+end