Compare commits
No commits in common. "bdfa535b75c1b49370891d82c348899afecf08ef" and "ec9586f87045f868b8c2ec4b5a32c12a01609d1d" have entirely different histories.
bdfa535b75
...
ec9586f870
14
build.gradle
14
build.gradle
|
@ -17,15 +17,15 @@ group = projectGroup
|
|||
version = projectVersion
|
||||
|
||||
dependencies {
|
||||
annotationProcessor 'info.picocli:picocli-codegen:4.7.4'
|
||||
implementation 'info.picocli:picocli:4.7.4'
|
||||
annotationProcessor 'info.picocli:picocli-codegen:4.7.3'
|
||||
implementation 'info.picocli:picocli:4.7.3'
|
||||
implementation 'org.slf4j:slf4j-api:2.0.7'
|
||||
implementation 'org.slf4j:slf4j-simple:2.0.7'
|
||||
implementation 'com.squareup.okhttp3:okhttp:4.11.0' // Also used by InfluxDB Client
|
||||
implementation 'com.influxdb:influxdb-client-java:6.10.0'
|
||||
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
|
||||
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
|
||||
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.15.2'
|
||||
implementation 'com.squareup.okhttp3:okhttp:4.10.0' // Also used by InfluxDB Client
|
||||
implementation 'com.influxdb:influxdb-client-java:6.8.0'
|
||||
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.3'
|
||||
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.3'
|
||||
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.14.3'
|
||||
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
|
||||
|
|
|
@ -11,9 +11,9 @@ Ensure you have **correct date/time** and NTPd running to keep it accurate!
|
|||
- Navigate to *Users and Security*
|
||||
- Create a new read-only/viewer **hmci** user, which will be used to connect to the HMC.
|
||||
- Click *Manage User Profiles and Access*, edit the newly created *hmci* user and click *User Properties*:
|
||||
- Set *Session timeout minutes* to **120** (or at least 61 minutes)
|
||||
- Set *Session timeout minutes* to **60**
|
||||
- Set *Verify timeout minutes* to **15**
|
||||
- Set *Idle timeout minutes* to **15**
|
||||
- Set *Idle timeout minutes* to **90**
|
||||
- Set *Minimum time in days between password changes* to **0**
|
||||
- **Enable** *Allow remote access via the web*
|
||||
- Navigate to *HMC Management* and *Console Settings*
|
||||
|
|
|
@ -51,8 +51,8 @@ If you are running Linux on Power, you can find ppc64le Grafana packages on the
|
|||
[Download](https://git.data.coop/nellemann/-/packages/generic/hmci/) the latest version of HMCi packaged for rpm.
|
||||
|
||||
```shell
|
||||
wget https://git.data.coop/api/packages/nellemann/generic/hmci/v1.4.4/hmci-1.4.2-1.noarch.rpm
|
||||
rpm -ivh hmci-1.4.4-1_all.rpm
|
||||
wget https://git.data.coop/api/packages/nellemann/generic/hmci/v1.4.2/hmci-1.4.2-1.noarch.rpm
|
||||
rpm -ivh hmci-1.4.2-1_all.rpm
|
||||
cp /opt/hmci/doc/hmci.toml /etc/
|
||||
cp /opt/hmci/doc/hmci.service /etc/systemd/system/
|
||||
systemctl daemon-reload
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
projectId = hmci
|
||||
projectGroup = biz.nellemann.hmci
|
||||
projectVersion = 1.4.5
|
||||
projectVersion = 1.4.4
|
||||
|
|
|
@ -83,10 +83,10 @@ public final class InfluxClient {
|
|||
Runtime.getRuntime().addShutdownHook(new Thread(influxDBClient::close));
|
||||
|
||||
// Todo: Handle events - https://github.com/influxdata/influxdb-client-java/tree/master/client#handle-the-events
|
||||
//writeApi = influxDBClient.makeWriteApi();
|
||||
writeApi = influxDBClient.makeWriteApi(
|
||||
WriteOptions.builder()
|
||||
.batchSize(15_000)
|
||||
.bufferLimit(500_000)
|
||||
.bufferLimit(20_000)
|
||||
.flushInterval(5_000)
|
||||
.build());
|
||||
|
||||
|
|
|
@ -16,8 +16,6 @@ import java.security.KeyManagementException;
|
|||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.SecureRandom;
|
||||
import java.security.cert.X509Certificate;
|
||||
import java.time.Instant;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
|
@ -40,9 +38,6 @@ public class RestClient {
|
|||
protected final String username;
|
||||
protected final String password;
|
||||
|
||||
private final static int MAX_MINUTES_BETWEEN_AUTHENTICATION = 60; // TODO: Make configurable and match HMC timeout settings
|
||||
private Instant lastAuthenticationTimestamp;
|
||||
|
||||
|
||||
public RestClient(String baseUrl, String username, String password, Boolean trustAll) {
|
||||
this.baseUrl = baseUrl;
|
||||
|
@ -68,8 +63,6 @@ public class RestClient {
|
|||
log.error("ManagementConsole() - trace error: " + e.getMessage());
|
||||
}
|
||||
}*/
|
||||
Thread shutdownHook = new Thread(this::logoff);
|
||||
Runtime.getRuntime().addShutdownHook(shutdownHook);
|
||||
}
|
||||
|
||||
|
||||
|
@ -77,9 +70,6 @@ public class RestClient {
|
|||
* Logon to the HMC and get an authentication token for further requests.
|
||||
*/
|
||||
public synchronized void login() {
|
||||
if(authToken != null) {
|
||||
logoff();
|
||||
}
|
||||
|
||||
log.info("Connecting to HMC - {} @ {}", username, baseUrl);
|
||||
StringBuilder payload = new StringBuilder();
|
||||
|
@ -112,12 +102,10 @@ public class RestClient {
|
|||
LogonResponse logonResponse = xmlMapper.readValue(responseBody, LogonResponse.class);
|
||||
|
||||
authToken = logonResponse.getToken();
|
||||
lastAuthenticationTimestamp = Instant.now();
|
||||
log.debug("logon() - auth token: {}", authToken);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.warn("logon() - error: {}", e.getMessage());
|
||||
lastAuthenticationTimestamp = null;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -148,7 +136,6 @@ public class RestClient {
|
|||
log.warn("logoff() error: {}", e.getMessage());
|
||||
} finally {
|
||||
authToken = null;
|
||||
lastAuthenticationTimestamp = null;
|
||||
}
|
||||
|
||||
} catch (MalformedURLException e) {
|
||||
|
@ -177,9 +164,6 @@ public class RestClient {
|
|||
public synchronized String getRequest(URL url) throws IOException {
|
||||
|
||||
log.debug("getRequest() - URL: {}", url.toString());
|
||||
if (lastAuthenticationTimestamp == null || lastAuthenticationTimestamp.plus(MAX_MINUTES_BETWEEN_AUTHENTICATION, ChronoUnit.MINUTES).isBefore(Instant.now())) {
|
||||
login();
|
||||
}
|
||||
|
||||
Request request = new Request.Builder()
|
||||
.url(url)
|
||||
|
@ -238,10 +222,6 @@ public class RestClient {
|
|||
public synchronized String postRequest(URL url, String payload) throws IOException {
|
||||
|
||||
log.debug("sendPostRequest() - URL: {}", url.toString());
|
||||
if (lastAuthenticationTimestamp == null || lastAuthenticationTimestamp.plus(MAX_MINUTES_BETWEEN_AUTHENTICATION, ChronoUnit.MINUTES).isBefore(Instant.now())) {
|
||||
login();
|
||||
}
|
||||
|
||||
RequestBody requestBody;
|
||||
if(payload != null) {
|
||||
requestBody = RequestBody.create(payload, MEDIA_TYPE_IBM_XML_POST);
|
||||
|
|
|
@ -5,6 +5,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public final class PowerUtil {
|
||||
|
||||
public float powerReading = 0.0F;
|
||||
public Number powerReading = 0.0;
|
||||
|
||||
}
|
||||
|
|
|
@ -52,7 +52,6 @@ class LogicalPartitionTest extends Specification {
|
|||
}
|
||||
|
||||
def cleanupSpec() {
|
||||
serviceClient.logoff()
|
||||
mockServer.stop()
|
||||
}
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ class ManagedSystemTest extends Specification {
|
|||
}
|
||||
|
||||
def cleanupSpec() {
|
||||
serviceClient.logoff()
|
||||
mockServer.stop()
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue