-
Notifications
You must be signed in to change notification settings - Fork 339
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add TM integration and separate docker-compose services for Varnish (#…
…7746) * Add TM integration and separate docker-compose services for Varnish * Add vstats parser tests * Get interface from TM and remove concurrency * Remove . and / from interface names
- Loading branch information
1 parent
0410344
commit b31e003
Showing
10 changed files
with
317 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| # | ||
| # This compose file will run cache servers as Varnish instead of ATS. | ||
| # | ||
| # docker-compose -f docker-compose.yml -f docker-compose.varnish.yml up | ||
| # | ||
|
|
||
| --- | ||
| version: '3.8' | ||
|
|
||
| services: | ||
| edge: | ||
| build: | ||
| dockerfile: infrastructure/cdn-in-a-box/varnish/Dockerfile | ||
| mid-01: | ||
| build: | ||
| dockerfile: infrastructure/cdn-in-a-box/varnish/Dockerfile | ||
| mid-02: | ||
| build: | ||
| dockerfile: infrastructure/cdn-in-a-box/varnish/Dockerfile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| package main | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "flag" | ||
| "fmt" | ||
| "log" | ||
| "net/http" | ||
| "os" | ||
| "os/exec" | ||
| "strconv" | ||
| "strings" | ||
| ) | ||
|
|
||
| type vstats struct { | ||
| ProcLoadavg string `json:"proc.loadavg"` | ||
| ProcNetDev string `json:"proc.net.dev"` | ||
| InfSpeed int64 `json:"inf_speed"` | ||
| NotAvailable bool `json:"not_available"` | ||
| // TODO: stats | ||
| } | ||
|
|
||
| func getSystemData(inf string) vstats { | ||
| var vstats vstats | ||
| loadavg, err := os.ReadFile("/proc/loadavg") | ||
| if err != nil { | ||
| log.Printf("failed to read /proc/loadavg: %s\n", err) | ||
| } | ||
| vstats.ProcLoadavg = strings.TrimSpace(string(loadavg)) | ||
|
|
||
| procNetDev, err := os.ReadFile("/proc/net/dev") | ||
| if err != nil { | ||
| log.Printf("failed to read /proc/net/dev: %s\n", err) | ||
| } | ||
|
|
||
| parts := strings.Split(string(procNetDev), "\n") | ||
| for _, line := range parts { | ||
| if strings.HasPrefix(strings.TrimSpace(line), inf) { | ||
| vstats.ProcNetDev = strings.TrimSpace(line) | ||
| break | ||
| } | ||
| } | ||
|
|
||
| infSpeedFile := fmt.Sprintf("/sys/class/net/%s/speed", inf) | ||
| speedStr, err := os.ReadFile(infSpeedFile) | ||
| if err != nil { | ||
| log.Printf("failed to read %s: %s\n", infSpeedFile, err) | ||
| } | ||
| speed, err := strconv.ParseInt(strings.TrimSpace(string(speedStr)), 10, 64) | ||
| if err != nil { | ||
| log.Printf("failed to convert speed '%s' to int: %s\n", speedStr, err) | ||
| } | ||
| vstats.InfSpeed = speed | ||
|
|
||
| cmd := exec.Command("systemctl", "status", "varnish.service") | ||
| err = cmd.Run() | ||
| if err != nil { | ||
| log.Printf("failed to run systemctl: %s\n", err) | ||
| } | ||
| if cmd.ProcessState.ExitCode() != 0 { | ||
| vstats.NotAvailable = true | ||
| } | ||
| return vstats | ||
| } | ||
|
|
||
| func getStats(w http.ResponseWriter, r *http.Request) { | ||
| inf := r.URL.Query().Get("inf.name") | ||
| if inf == "" { | ||
| // assume default eth0? | ||
| inf = "eth0" | ||
| } | ||
| inf = strings.ReplaceAll(inf, ".", "") | ||
| inf = strings.ReplaceAll(inf, "/", "") | ||
| vstats := getSystemData(inf) | ||
| encoder := json.NewEncoder(w) | ||
| err := encoder.Encode(vstats) | ||
| if err != nil { | ||
| log.Printf("failed to write Varnish stats: %s", err) | ||
| } | ||
| } | ||
|
|
||
| func main() { | ||
| var port int | ||
| flag.IntVar(&port, "port", 2000, "port to run vstats on") | ||
|
|
||
| flag.Parse() | ||
| http.HandleFunc("/", getStats) | ||
|
|
||
| listenAddress := fmt.Sprintf(":%d", port) | ||
| if err := http.ListenAndServe(listenAddress, nil); err != nil { | ||
| log.Printf("server stopped %s", err) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package cache | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "io" | ||
|
|
||
| "github.com/apache/trafficcontrol/lib/go-log" | ||
| "github.com/apache/trafficcontrol/traffic_monitor/todata" | ||
| jsoniter "github.com/json-iterator/go" | ||
| ) | ||
|
|
||
| func init() { | ||
| registerDecoder("vstats", vstatsParse, vstatsPrecompute) | ||
| } | ||
|
|
||
| // Vstats holds Varnish cache statistics | ||
| type Vstats struct { | ||
| ProcNetDev string `json:"proc.net.dev"` | ||
| ProcLoadAvg string `json:"proc.loadavg"` | ||
| NotAvailable bool `json:"not_available"` | ||
| InfSpeed int64 `json:"inf_speed"` | ||
| Stats map[string]interface{} `json:"stats"` | ||
| } | ||
|
|
||
| func vstatsParse(cacheName string, r io.Reader, _ interface{}) (Statistics, map[string]interface{}, error) { | ||
| var stats Statistics | ||
|
|
||
| if r == nil { | ||
| log.Warnf("%s handler got nil reader", cacheName) | ||
| return stats, nil, errors.New("handler got nil reader") | ||
| } | ||
|
|
||
| var vstats Vstats | ||
| json := jsoniter.ConfigFastest | ||
|
|
||
| if err := json.NewDecoder(r).Decode(&vstats); err != nil { | ||
| return stats, nil, fmt.Errorf("failed to decode reader data: %w", err) | ||
| } | ||
| if err := stats.AddInterfaceFromRawLine(vstats.ProcNetDev); err != nil { | ||
| return stats, nil, fmt.Errorf("failed to add interface data %s: %w", vstats.ProcNetDev, err) | ||
| } | ||
|
|
||
| if loadAvg, err := LoadavgFromRawLine(vstats.ProcLoadAvg); err != nil { | ||
| return stats, nil, fmt.Errorf("failed to read average load data %s: %w", vstats.ProcLoadAvg, err) | ||
| } else { | ||
| stats.Loadavg = loadAvg | ||
| } | ||
|
|
||
| stats.NotAvailable = vstats.NotAvailable | ||
| inf := stats.Interfaces["eth0"] | ||
| inf.Speed = vstats.InfSpeed | ||
| stats.Interfaces["eth0"] = inf | ||
|
|
||
| return stats, vstats.Stats, nil | ||
| } | ||
|
|
||
| func vstatsPrecompute(cacheName string, data todata.TOData, stats Statistics, miscStats map[string]interface{}) PrecomputedData { | ||
| return PrecomputedData{DeliveryServiceStats: map[string]*DSStat{}} | ||
| } |
Oops, something went wrong.