Skip to content

Commit

Permalink
Fix cluster metadata indexing
Browse files Browse the repository at this point in the history
Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
  • Loading branch information
rsevilla87 committed Nov 17, 2022
1 parent dd1d812 commit 24095ef
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion cmd/kube-burner/ocp.go
Expand Up @@ -17,6 +17,7 @@ package main
import (
"fmt"
"log"
"strings"

"github.com/cloud-bulldozer/kube-burner/pkg/workloads"
uid "github.com/satori/go.uuid"
Expand All @@ -41,7 +42,7 @@ func openShiftCmd() *cobra.Command {
ocpCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
rootCmd.PersistentPreRun(cmd, args)
envVars := map[string]string{
"ES_SERVER": *esServer,
"ES_SERVER": strings.TrimSuffix(*esServer, "/"),
"ES_INDEX": *esIndex,
"QPS": fmt.Sprintf("%d", *qps),
"BURST": fmt.Sprintf("%d", *burst),
Expand Down
15 changes: 8 additions & 7 deletions pkg/workloads/helpers.go
Expand Up @@ -18,6 +18,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io"
"net/http"
"os"
"time"
Expand Down Expand Up @@ -123,24 +124,24 @@ func (wh *WorkloadHelper) IndexMetadata() {
if wh.envVars["ES_SERVER"] == "" {
log.Info("No metadata will be indexed")
}
esEndpoint := fmt.Sprintf("%v/%v/document", wh.envVars["ES_SERVER"], wh.envVars["ES_INDEX"])
body, err := json.Marshal(wh.Metadata)
if err != nil {
log.Fatal(err)
}
esEndpoint := fmt.Sprintf("%v/%v/_doc", wh.envVars["ES_SERVER"], wh.envVars["ES_INDEX"])
body, _ := json.Marshal(wh.Metadata)
resp, err := http.Post(esEndpoint, "application/json", bytes.NewBuffer(body))
if err != nil {
log.Error("Error indexing metadata:", err)
log.Error("Error indexing metadata: ", err)
return
}
if resp.StatusCode == http.StatusCreated {
log.Info("Cluster metadata indexed correctly")
} else {
b, _ := io.ReadAll(resp.Body)
log.Errorf("Error indexing metadata, code: %v body: %s", resp.StatusCode, b)
}
}

func (wh *WorkloadHelper) run(configFile string) {
var alertM *alerting.AlertManager
var rc int
var alertM *alerting.AlertManager
configSpec, err := config.Parse(configFile, true)
if err != nil {
log.Fatal(err)
Expand Down

0 comments on commit 24095ef

Please sign in to comment.