Revert "Filter alerts"

api/error.go

@@ -5,10 +5,9 @@ import "fmt"
 type EntityType string
 
 const (
-	EntityTypeParser      EntityType = "parser"
-	EntityTypeAction      EntityType = "action"
-	EntityTypeAlert       EntityType = "alert"
-	EntityTypeFilterAlert EntityType = "filter-alert"
+	EntityTypeParser EntityType = "parser"
+	EntityTypeAction EntityType = "action"
+	EntityTypeAlert  EntityType = "alert"
 )
 
 func (e EntityType) String() string {
@@ -52,10 +51,3 @@ func AlertNotFound(name string) error {
 		key:        name,
 	}
 }
-
-func FilterAlertNotFound(name string) error {
-	return EntityNotFound{
-		entityType: EntityTypeFilterAlert,
-		key:        name,
-	}
-}

api/internal/humiographql/alerts.go

@@ -16,12 +16,18 @@ type Alert struct {
 	Actions            []graphql.String `graphql:"actions"`
 	Labels             []graphql.String `graphql:"labels"`
 	LastError          graphql.String   `graphql:"lastError"`
-	QueryOwnership     QueryOwnership   `graphql:"queryOwnership"`
-	RunAsUser          struct {
+	QueryOwnership     struct {
+		ID                     graphql.String         `graphql:"id"`
+		QueryOwnershipTypeName QueryOwnershipTypeName `graphql:"__typename"`
+	} `graphql:"queryOwnership"`
+	RunAsUser struct {
 		ID graphql.String `graphql:"id"`
 	} `graphql:"runAsUser"`
 }
 
+type QueryOwnership struct {
+}
+
 type CreateAlert struct {
 	ViewName           graphql.String     `json:"viewName"`
 	Name               graphql.String     `json:"name"`
@@ -52,3 +58,19 @@ type UpdateAlert struct {
 	Labels             []graphql.String   `json:"labels"`
 	QueryOwnershipType QueryOwnershipType `json:"queryOwnershipType,omitempty"`
 }
+
+type Long int64
+
+type QueryOwnershipTypeName string
+
+const (
+	QueryOwnershipTypeNameOrganization QueryOwnershipTypeName = "OrganizationOwnership"
+	QueryOwnershipTypeNameUser         QueryOwnershipTypeName = "UserOwnership"
+)
+
+type QueryOwnershipType string
+
+const (
+	QueryOwnershipTypeUser         QueryOwnershipType = "User"
+	QueryOwnershipTypeOrganization QueryOwnershipType = "Organization"
+)

cmd/humioctl/alerts_install.go

@@ -52,9 +52,9 @@ The install command allows you to install alerts from a URL or from a local file
 			// if we only got <view> you must supply --file or --url.
 			if l := len(args); l == 1 {
 				if filePath != "" {
-					content, err = getBytesFromFile(filePath)
+					content, err = getAlertFromFile(filePath)
 				} else if url != "" {
-					content, err = getBytesFromURL(url)
+					content, err = getURLAlert(url)
 				} else {
 					cmd.Printf("You must specify a path using --file or --url\n")
 					os.Exit(1)