Skip to content

Commit 183edf8

Browse files
axif0axif0
committed
Removed unnecessary import alias v1
Signed-off-by: axif <muhamadasif570@gmail.com>
1 parent 31d5111 commit 183edf8

File tree

3 files changed

+41
-39
lines changed

3 files changed

+41
-39
lines changed

‎cmd/metrics-scraper/app/scrape/job.go

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
v1 "github.com/karmada-io/dashboard/cmd/metrics-scraper/app/db"
7+
8+
"github.com/karmada-io/dashboard/cmd/metrics-scraper/app/db"
89
"github.com/karmada-io/dashboard/pkg/client"
910
"github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1"
1011

@@ -21,32 +22,32 @@ import (
2122
type SaveRequest struct {
2223
appName string
2324
podName string
24-
data *v1.ParsedData
25+
data *db.ParsedData
2526
result chan error
2627
}
2728

28-
func FetchMetrics(ctx context.Context, appName string, requests chan SaveRequest) (map[string]*v1.ParsedData, []string, error) {
29+
func FetchMetrics(ctx context.Context, appName string, requests chan SaveRequest) (map[string]*db.ParsedData, []string, error) {
2930
kubeClient := client.InClusterClient()
3031
podsMap, errors := getKarmadaPods(ctx, appName) // Pass context here
3132
if len(podsMap) == 0 && len(errors) > 0 {
3233
return nil, errors, fmt.Errorf("no pods found")
3334
}
34-
allMetrics := make(map[string]*v1.ParsedData)
35+
allMetrics := make(map[string]*db.ParsedData)
3536
var mu sync.Mutex
3637
var wg sync.WaitGroup
3738
for clusterName, pods := range podsMap {
3839
for _, pod := range pods {
3940
wg.Add(1)
40-
go func(ctx context.Context, pod v1.PodInfo, clusterName string) {
41+
go func(ctx context.Context, pod db.PodInfo, clusterName string) {
4142
defer wg.Done()
4243
select {
4344
case <-ctx.Done():
4445
return
4546
default:
4647
}
47-
var jsonMetrics *v1.ParsedData
48+
var jsonMetrics *db.ParsedData
4849
var err error
49-
if appName == v1.KarmadaAgent {
50+
if appName == db.KarmadaAgent {
5051
jsonMetrics, err = getKarmadaAgentMetrics(ctx, pod.Name, clusterName, requests)
5152
if err != nil {
5253
mu.Lock()
@@ -55,12 +56,12 @@ func FetchMetrics(ctx context.Context, appName string, requests chan SaveRequest
5556
return
5657
}
5758
} else {
58-
port := v1.SchedulerPort
59-
if appName == v1.KarmadaControllerManager {
60-
port = v1.ControllerManagerPort
59+
port := db.SchedulerPort
60+
if appName == db.KarmadaControllerManager {
61+
port = db.ControllerManagerPort
6162
}
6263
metricsOutput, err := kubeClient.CoreV1().RESTClient().Get().
63-
Namespace(v1.Namespace).
64+
Namespace(db.Namespace).
6465
Resource("pods").
6566
SubResource("proxy").
6667
Name(fmt.Sprintf("%s:%s", pod.Name, port)).
@@ -101,12 +102,12 @@ func FetchMetrics(ctx context.Context, appName string, requests chan SaveRequest
101102
return allMetrics, errors, nil
102103
}
103104

104-
func getKarmadaPods(ctx context.Context, appName string) (map[string][]v1.PodInfo, []string) {
105+
func getKarmadaPods(ctx context.Context, appName string) (map[string][]db.PodInfo, []string) {
105106
kubeClient := client.InClusterClient()
106-
podsMap := make(map[string][]v1.PodInfo)
107+
podsMap := make(map[string][]db.PodInfo)
107108
var errors []string
108109

109-
if appName == v1.KarmadaAgent {
110+
if appName == db.KarmadaAgent {
110111
karmadaClient := client.InClusterKarmadaClient()
111112
clusters, err := karmadaClient.ClusterV1alpha1().Clusters().List(ctx, metav1.ListOptions{})
112113
if err != nil {
@@ -125,7 +126,7 @@ func getKarmadaPods(ctx context.Context, appName string) (map[string][]v1.PodInf
125126
}
126127
}
127128
} else {
128-
pods, err := kubeClient.CoreV1().Pods(v1.Namespace).List(ctx, metav1.ListOptions{
129+
pods, err := kubeClient.CoreV1().Pods(db.Namespace).List(ctx, metav1.ListOptions{
129130
LabelSelector: fmt.Sprintf("app=%s", appName),
130131
})
131132
if err != nil {
@@ -134,14 +135,14 @@ func getKarmadaPods(ctx context.Context, appName string) (map[string][]v1.PodInf
134135
}
135136

136137
for _, pod := range pods.Items {
137-
podsMap[appName] = append(podsMap[appName], v1.PodInfo{Name: pod.Name})
138+
podsMap[appName] = append(podsMap[appName], db.PodInfo{Name: pod.Name})
138139
}
139140
}
140141

141142
return podsMap, errors
142143
}
143144

144-
func getClusterPods(ctx context.Context, cluster *v1alpha1.Cluster) ([]v1.PodInfo, error) {
145+
func getClusterPods(ctx context.Context, cluster *v1alpha1.Cluster) ([]db.PodInfo, error) {
145146
fmt.Printf("Getting pods for cluster: %s\n", cluster.Name)
146147

147148
kubeconfigPath := os.Getenv("KUBECONFIG")
@@ -172,17 +173,17 @@ func getClusterPods(ctx context.Context, cluster *v1alpha1.Cluster) ([]v1.PodInf
172173

173174
fmt.Printf("Found %d pods in cluster %s\n", len(podList.Items), cluster.Name)
174175

175-
var podInfos []v1.PodInfo
176+
var podInfos []db.PodInfo
176177
for _, pod := range podList.Items {
177-
podInfos = append(podInfos, v1.PodInfo{
178+
podInfos = append(podInfos, db.PodInfo{
178179
Name: pod.Name,
179180
})
180181
}
181182

182183
return podInfos, nil
183184
}
184185

185-
func getKarmadaAgentMetrics(ctx context.Context, podName string, clusterName string, requests chan SaveRequest) (*v1.ParsedData, error) {
186+
func getKarmadaAgentMetrics(ctx context.Context, podName string, clusterName string, requests chan SaveRequest) (*db.ParsedData, error) {
186187
kubeClient := client.InClusterKarmadaClient()
187188
clusters, err := kubeClient.ClusterV1alpha1().Clusters().List(ctx, metav1.ListOptions{})
188189
if err != nil {
@@ -232,15 +233,15 @@ func getKarmadaAgentMetrics(ctx context.Context, podName string, clusterName str
232233
return nil, fmt.Errorf("failed to retrieve metrics: %v", err)
233234
}
234235

235-
var parsedData *v1.ParsedData
236+
var parsedData *db.ParsedData
236237
if isJSON(metricsOutput) {
237-
parsedData = &v1.ParsedData{}
238+
parsedData = &db.ParsedData{}
238239
err = json.Unmarshal(metricsOutput, parsedData)
239240
if err != nil {
240241
return nil, fmt.Errorf("failed to unmarshal JSON metrics: %v", err)
241242
}
242243
} else {
243-
var parsedDataPtr *v1.ParsedData
244+
var parsedDataPtr *db.ParsedData
244245
parsedDataPtr, err = parseMetricsToJSON(string(metricsOutput))
245246
if err != nil {
246247
return nil, fmt.Errorf("failed to parse metrics to JSON: %v", err)
@@ -251,7 +252,7 @@ func getKarmadaAgentMetrics(ctx context.Context, podName string, clusterName str
251252
// Send save request to the database worker
252253
select {
253254
case requests <- SaveRequest{
254-
appName: v1.KarmadaAgent,
255+
appName: db.KarmadaAgent,
255256
podName: podName,
256257
data: parsedData,
257258
result: nil, // Not waiting for result

‎cmd/metrics-scraper/app/scrape/other.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"encoding/json"
1010
"fmt"
1111
_ "github.com/glebarez/sqlite"
12-
v1 "github.com/karmada-io/dashboard/cmd/metrics-scraper/app/db"
12+
"github.com/karmada-io/dashboard/cmd/metrics-scraper/app/db"
1313
"github.com/prometheus/common/expfmt"
1414
)
1515

1616
var dbMutex sync.Mutex
1717

18-
func saveToDBWithConnection(db *sql.DB, appName, podName string, data *v1.ParsedData) (err error) {
18+
func saveToDBWithConnection(db *sql.DB, appName, podName string, data *db.ParsedData) (err error) {
1919
sanitizedPodName := strings.ReplaceAll(podName, "-", "_")
2020
log.Printf("Saving data for app '%s', pod '%s' (sanitized: '%s')", appName, podName, sanitizedPodName)
2121

@@ -174,21 +174,21 @@ func startDatabaseWorker(requests chan SaveRequest) {
174174
}
175175
}
176176

177-
func parseMetricsToJSON(metricsOutput string) (*v1.ParsedData, error) {
177+
func parseMetricsToJSON(metricsOutput string) (*db.ParsedData, error) {
178178
var parser expfmt.TextParser
179179
metricFamilies, err := parser.TextToMetricFamilies(strings.NewReader(metricsOutput))
180180
if err != nil {
181181
return nil, fmt.Errorf("error parsing metrics: %w", err)
182182
}
183183

184-
metrics := make(map[string]*v1.Metric)
184+
metrics := make(map[string]*db.Metric)
185185

186186
for name, mf := range metricFamilies {
187-
m := &v1.Metric{
187+
m := &db.Metric{
188188
Name: name,
189189
Help: mf.GetHelp(),
190190
Type: mf.GetType().String(),
191-
Values: []v1.MetricValue{},
191+
Values: []db.MetricValue{},
192192
}
193193

194194
for _, metric := range mf.Metric {
@@ -205,38 +205,38 @@ func parseMetricsToJSON(metricsOutput string) (*v1.ParsedData, error) {
205205
bucketLabels[k] = v
206206
}
207207
bucketLabels["le"] = fmt.Sprintf("%f", bucket.GetUpperBound())
208-
m.Values = append(m.Values, v1.MetricValue{
208+
m.Values = append(m.Values, db.MetricValue{
209209
Labels: bucketLabels,
210210
Value: bucketValue,
211211
Measure: "cumulative_count",
212212
})
213213
}
214-
m.Values = append(m.Values, v1.MetricValue{
214+
m.Values = append(m.Values, db.MetricValue{
215215
Labels: labels,
216216
Value: fmt.Sprintf("%f", metric.Histogram.GetSampleSum()),
217217
Measure: "sum",
218218
})
219-
m.Values = append(m.Values, v1.MetricValue{
219+
m.Values = append(m.Values, db.MetricValue{
220220
Labels: labels,
221221
Value: fmt.Sprintf("%d", metric.Histogram.GetSampleCount()),
222222
Measure: "count",
223223
})
224224
} else if metric.Counter != nil {
225225
value := fmt.Sprintf("%f", metric.Counter.GetValue())
226-
m.Values = append(m.Values, v1.MetricValue{
226+
m.Values = append(m.Values, db.MetricValue{
227227
Labels: labels,
228228
Value: value,
229229
Measure: "total",
230230
})
231231
} else if metric.Gauge != nil {
232232
value := fmt.Sprintf("%f", metric.Gauge.GetValue())
233-
m.Values = append(m.Values, v1.MetricValue{
233+
m.Values = append(m.Values, db.MetricValue{
234234
Labels: labels,
235235
Value: value,
236236
Measure: "current_value",
237237
})
238238
} else {
239-
m.Values = append(m.Values, v1.MetricValue{
239+
m.Values = append(m.Values, db.MetricValue{
240240
Labels: labels,
241241
Value: "",
242242
Measure: "unhandled_metric_type",
@@ -249,7 +249,7 @@ func parseMetricsToJSON(metricsOutput string) (*v1.ParsedData, error) {
249249

250250
currentTime := time.Now().Format(time.RFC3339)
251251

252-
parsedData := &v1.ParsedData{
252+
parsedData := &db.ParsedData{
253253
CurrentTime: currentTime,
254254
Metrics: metrics,
255255
}

‎cmd/metrics-scraper/app/scrape/scrape.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import(
99

1010
"fmt"
1111
"net/http"
12-
"github.com/gin-gonic/gin"
13-
db "github.com/karmada-io/dashboard/cmd/metrics-scraper/app/db"
12+
13+
"github.com/gin-gonic/gin"
14+
"github.com/karmada-io/dashboard/cmd/metrics-scraper/app/db"
1415
)
1516

1617
var (

0 commit comments

Comments
 (0)