towk/magellan
1
0
Fork 0
mirror of https://github.com/davidallendj/magellan.git synced 2025-12-20 03:27:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor tweaks, changes, and fixes

Browse source 
Signed-off-by: David J. Allen <davidallendj@gmail.com>
This commit is contained in:
David Allen 2023-09-14 13:41:12 -06:00
parent 34367f830a
commit 8faa570b0a
6 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -74,7 +74,7 @@ and `pass/password` flag to be set to use `ipmitool` (which must installed as we
Additionally, it may be necessary to set the `host` and `port` flags for `magellan`
to find the `hms-smd` API.
Note: If `db.path` is not set, `magellan` will use /tmp/magellan.db by default.
Note: If the `db.path` flag is not set, `magellan` will use /tmp/magellan.db by default.
## TODO

6
bin/magellan.sh
View file

@ -4,14 +4,14 @@ function build(){
}
function scan() {
./magellan scan --subnet 172.16.0.0 --db.path data/assets.db --port 443,623,5000
./magellan scan --subnet 172.16.0.0 --port 443
}
function list(){
./magellan list --db.path data/assets.db
./magellan list
}
function collect() {
./magellan collect --db.path data/assets.db --driver redfish --timeout 30 --user admin --pass password
./magellan collect --user admin --pass password
}

2
cmd/collect.go
View file

@ -31,6 +31,7 @@ var collectCmd = &cobra.Command{
User: user,
Pass: pass,
Drivers: drivers,
Preferred: preferredDriver,
Timeout: timeout,
Threads: threads,
Verbose: verbose,
@ -52,7 +53,6 @@ func init(){
collectCmd.PersistentFlags().IntVar(&smd.Port, "port", smd.Port, "set the port to the smd API")
collectCmd.PersistentFlags().StringVar(&user, "user", "", "set the BMC user")
collectCmd.PersistentFlags().StringVar(&pass, "pass", "", "set the BMC password")
collectCmd.PersistentFlags().StringVar(&pass, "password", "", "set the BMC password")
collectCmd.PersistentFlags().StringVar(&preferredDriver, "preferred-driver", "ipmi", "set the preferred driver to use")
collectCmd.PersistentFlags().StringVar(&ipmitoolPath, "ipmitool.path", "/usr/bin/ipmitool", "set the path for ipmitool")
collectCmd.PersistentFlags().BoolVar(&withSecureTLS, "secure-tls", false, "enable secure TLS")

2
cmd/root.go
View file

@ -49,7 +49,7 @@ func Execute() {
func init() {
rootCmd.PersistentFlags().IntVar(&threads, "threads", -1, "set the number of threads")
rootCmd.PersistentFlags().IntVar(&timeout, "timeout", 10, "set the timeout")
rootCmd.PersistentFlags().IntVar(&timeout, "timeout", 30, "set the timeout")
rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", true, "set verbose flag")
rootCmd.PersistentFlags().StringVar(&dbpath, "db.path", "/tmp/magellan.db", "set the probe storage path")
}

53
internal/collect.go
View file

@ -2,10 +2,12 @@ package magellan
import (
"context"
"crypto/tls"
"crypto/x509"
"davidallendj/magellan/internal/api/smd"
"encoding/json"
"fmt"
"net/http"
"os"
"sync"
"time"
@ -14,7 +16,6 @@ import (
bmclib "github.com/bmc-toolbox/bmclib/v2"
"github.com/jacobweinstock/registrar"
_ "github.com/mattn/go-sqlite3"
"github.com/sirupsen/logrus"
"github.com/stmcginnis/gofish"
_ "github.com/stmcginnis/gofish"
"github.com/stmcginnis/gofish/redfish"
@ -25,7 +26,6 @@ const (
IPMI_PORT = 623
SSH_PORT = 22
HTTPS_PORT = 443
REDFISH_PORT = 5000
)
type BMCProbeResult struct {
@ -55,20 +55,20 @@ func NewClient(l *Logger, q *QueryParams) (*bmclib.Client, error) {
// NOTE: bmclib.NewClient(host, port, user, pass)
// ...seems like the `port` params doesn't work like expected depending on interface
// tr := &http.Transport{
// TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
// }
// httpClient := http.Client{
// Transport: tr,
// }
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
httpClient := http.Client{
Transport: tr,
}
// init client
clientOpts := []bmclib.Option{
// bmclib.WithSecureTLS(nil),
// bmclib.WithHTTPClient(&httpClient),
bmclib.WithHTTPClient(&httpClient),
// bmclib.WithLogger(),
// bmclib.WithRedfishHTTPClient(&httpClient),
bmclib.WithDellRedfishUseBasicAuth(true),
bmclib.WithRedfishHTTPClient(&httpClient),
// bmclib.WithDellRedfishUseBasicAuth(true),
bmclib.WithRedfishPort(fmt.Sprint(q.Port)),
bmclib.WithRedfishUseBasicAuth(true),
bmclib.WithIpmitoolPort(fmt.Sprint(IPMI_PORT)),
@ -89,16 +89,9 @@ func NewClient(l *Logger, q *QueryParams) (*bmclib.Client, error) {
// a nil pool uses the system certs
clientOpts = append(clientOpts, bmclib.WithSecureTLS(pool))
}
// url := fmt.Sprintf("https://%s:%s@%s", q.User, q.Pass, q.Host)
url := ""
// if q.WithSecureTLS {
// url = "https://"
// } else {
// url = "http://"
// }
if q.User == "" && q.Pass == "" {
url += fmt.Sprintf("%s:%s@%s", q.User, q.Pass, q.Host)
if q.User != "" && q.Pass != "" {
url += fmt.Sprintf("https://%s:%s@%s", q.User, q.Pass, q.Host)
} else {
url += q.Host
}
@ -147,8 +140,6 @@ func CollectInfo(probeStates *[]BMCProbeResult, l *Logger, q *QueryParams) error
q.Host = ps.Host
q.Port = ps.Port
logrus.Printf("querying %v:%v (%v)\n", ps.Host, ps.Port, ps.Protocol)
client, err := NewClient(l, q)
if err != nil {
l.Log.Errorf("could not make client: %v", err)
@ -164,8 +155,7 @@ func CollectInfo(probeStates *[]BMCProbeResult, l *Logger, q *QueryParams) error
// inventories
inventory, err := QueryInventory(client, l, q)
if err != nil {
l.Log.Errorf("could not query inventory: %v", err)
continue
l.Log.Errorf("could not query inventory (%v:%v): %v", q.Host, q.Port, err)
}
// chassis
@ -185,6 +175,8 @@ func CollectInfo(probeStates *[]BMCProbeResult, l *Logger, q *QueryParams) error
data["Type"] = ""
data["Name"] = ""
data["FQDN"] = ps.Host
data["User"] = q.User
data["Password"] = q.Pass
data["RediscoverOnUpdate"] = false
data["Inventory"] = inventory
data["Chassis"] = chassis
@ -198,6 +190,8 @@ func CollectInfo(probeStates *[]BMCProbeResult, l *Logger, q *QueryParams) error
err = smd.AddRedfishEndpoint(b, headers)
if err != nil {
l.Log.Errorf("could not add redfish endpoint: %v", err)
// try updating instead
}
// users
@ -418,8 +412,13 @@ func QueryEthernetInterfaces(client *bmclib.Client, l *Logger, q *QueryParams) (
}
func QueryChassis(q *QueryParams) ([]byte, error) {
url := "https://"
if q.User != "" && q.Pass != "" {
url += fmt.Sprintf("%s:%s@", q.User, q.Pass)
}
url += fmt.Sprintf("%s:%d", q.Host, q.Port)
config := gofish.ClientConfig {
Endpoint: fmt.Sprintf("https://%s:%d", q.Host, q.Port),
Endpoint: url,
Username: q.User,
Password: q.Pass,
Insecure: !q.WithSecureTLS,
@ -427,11 +426,11 @@ func QueryChassis(q *QueryParams) ([]byte, error) {
}
c, err := gofish.Connect(config)
if err != nil {
return nil, fmt.Errorf("could not connect to bmc: %v", err)
return nil, fmt.Errorf("could not connect to bmc (%v:%v): %v", q.Host, q.Port, err)
}
chassis, err := c.Service.Chassis()
if err != nil {
return nil, fmt.Errorf("could not query chassis: %v", err)
return nil, fmt.Errorf("could not query chassis (%v:%v): %v", q.Host, q.Port, err)
}
b, err := json.MarshalIndent(chassis, "", " ")

2
internal/scan.go
View file

@ -92,5 +92,5 @@ func ScanForAssets(hosts []string, ports []int, threads int, timeout int) []BMCP
}
func GetDefaultPorts() []int {
return []int{SSH_PORT, HTTPS_PORT, IPMI_PORT, REDFISH_PORT}
return []int{SSH_PORT, HTTPS_PORT, IPMI_PORT}
}